diff --git a/src/kjotslinkdialog.cpp b/src/kjotslinkdialog.cpp
index 830271c..0ac0e91 100644
--- a/src/kjotslinkdialog.cpp
+++ b/src/kjotslinkdialog.cpp
@@ -1,89 +1,99 @@
 /*
     kjots
 
     Copyright (C) 2008 Stephen Kelly <steveire@gmail.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
 #include "kjotslinkdialog.h"
 #include "ui_linkdialog.h"
 #include "kjotsmodel.h"
 
 #include <QListView>
 #include <QPushButton>
 #include <QCompleter>
 
 #include <KDescendantsProxyModel>
 
 
 KJotsLinkDialog::KJotsLinkDialog(QAbstractItemModel *kjotsModel, QWidget *parent)
     : QDialog(parent)
     , ui(new Ui::LinkDialog)
+    , m_descendantsProxyModel(new KDescendantsProxyModel(this))
 {
     ui->setupUi(this);
 
-    m_descendantsProxyModel = new KDescendantsProxyModel(this);
     m_descendantsProxyModel->setSourceModel(kjotsModel);
     m_descendantsProxyModel->setAncestorSeparator(QStringLiteral(" / "));
     m_descendantsProxyModel->setDisplayAncestorData(true);
 
     ui->hrefCombo->lineEdit()->setPlaceholderText(i18n("Enter link URL, or another note or note book..."));
-    ui->hrefCombo->setModel(m_descendantsProxyModel);
+    ui->hrefCombo->setModel(m_descendantsProxyModel.get());
     // This is required because otherwise QComboBox will catch Enter, insert a new item and clear
     ui->hrefCombo->setInsertPolicy(QComboBox::NoInsert);
     ui->hrefCombo->setCurrentIndex(-1);
 
-    auto *completer = new QCompleter(m_descendantsProxyModel, this);
+    auto *completer = new QCompleter(m_descendantsProxyModel.get(), this);
     completer->setCaseSensitivity(Qt::CaseInsensitive);
     ui->hrefCombo->setCompleter(completer);
+
+    connect(ui->hrefCombo, &QComboBox::editTextChanged, this, &KJotsLinkDialog::slotTextChanged);
+    connect(ui->textEdit, &QLineEdit::textChanged, this, &KJotsLinkDialog::slotTextChanged);
+    slotTextChanged();
 }
 
 KJotsLinkDialog::~KJotsLinkDialog() = default;
 
+void KJotsLinkDialog::slotTextChanged()
+{
+    const bool ok = !ui->hrefCombo->currentText().trimmed().isEmpty() && !ui->textEdit->text().trimmed().isEmpty();
+    ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(ok);
+}
+
 void KJotsLinkDialog::setLinkText(const QString &linkText)
 {
     ui->textEdit->setText(linkText);
     if (!linkText.isEmpty()) {
         ui->textEdit->setFocus();
     }
 }
 
 void KJotsLinkDialog::setLinkUrl(const QString &linkUrl)
 {
-    const QModelIndex idx = KJotsModel::modelIndexForUrl(m_descendantsProxyModel, QUrl(linkUrl));
+    const QModelIndex idx = KJotsModel::modelIndexForUrl(m_descendantsProxyModel.get(), QUrl(linkUrl));
     if (idx.isValid()) {
         ui->hrefCombo->setCurrentIndex(idx.row());
     } else {
         ui->hrefCombo->setCurrentIndex(-1);
         ui->hrefCombo->setCurrentText(linkUrl);
     }
 }
 
 QString KJotsLinkDialog::linkText() const
 {
     return ui->textEdit->text().trimmed();
 }
 
 QString KJotsLinkDialog::linkUrl() const
 {
     const int row = ui->hrefCombo->currentIndex();
     if (row != -1) {
         return ui->hrefCombo->model()->index(row, 0).data(KJotsModel::EntityUrlRole).toString();
     } else {
         return ui->hrefCombo->currentText().trimmed();
     }
 }
 
diff --git a/src/kjotslinkdialog.h b/src/kjotslinkdialog.h
index 69ee2f3..400adc7 100644
--- a/src/kjotslinkdialog.h
+++ b/src/kjotslinkdialog.h
@@ -1,73 +1,75 @@
 /*
     kjots
 
     Copyright (C) 2008 Stephen Kelly <steveire@gmail.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
 #ifndef KJOTSLINKDIALOG_H
 #define KJOTSLINKDIALOG_H
 
 #include <QDialog>
 
 namespace Ui {
     class LinkDialog;
 }
 
 class QListView;
 
 class KDescendantsProxyModel;
 
 class QAbstractItemModel;
 class QString;
 
 
 class KJotsLinkDialog : public QDialog
 {
     Q_OBJECT
 public:
     explicit KJotsLinkDialog(QAbstractItemModel *kjotsModel, QWidget *parent = nullptr);
     ~KJotsLinkDialog();
 
     /**
      * Returns the link text shown in the dialog
      * @param linkText The initial text
      */
     void setLinkText(const QString &linkText);
 
     /**
      * Sets the target link url shown in the dialog
      * @param linkUrl The initial link target url
      */
     void setLinkUrl(const QString &linkUrl);
 
     /**
      * Returns the link text entered by the user.
      * @return The link text
      */
     QString linkText() const;
 
     /**
      * Returns the target link url entered by the user.
      * @return The link url
      */
     QString linkUrl() const;
+private Q_SLOTS:
+    void slotTextChanged();
 private:
     std::unique_ptr<Ui::LinkDialog> ui;
-    KDescendantsProxyModel *m_descendantsProxyModel;
+    std::unique_ptr<KDescendantsProxyModel> m_descendantsProxyModel;
 };
 
 #endif