diff --git a/src/PlotDock.cpp b/src/PlotDock.cpp
index 3f382fa7..0be88aa2 100644
--- a/src/PlotDock.cpp
+++ b/src/PlotDock.cpp
@@ -861,3 +861,10 @@ void PlotDock::toggleStackedBars(bool stacked)
     adjustBars();
     ui->plotWidget->replot();
 }
+
+void PlotDock::reject()
+{
+    // We override this, to ensure the Escape key doesn't make this dialog
+    // dock go away
+    return;
+}
diff --git a/src/PlotDock.h b/src/PlotDock.h
index 11631582..fb609f9a 100644
--- a/src/PlotDock.h
+++ b/src/PlotDock.h
@@ -67,6 +67,7 @@ public slots:
     void updatePlot(SqliteTableModel* model, BrowseDataTableSettings* settings = nullptr, bool update = true, bool keepOrResetSelection = true);
     void fetchAllData();
     void resetPlot();
+    virtual void reject();
 
 signals:
     void pointsSelected(int firstIndex, int count);
diff --git a/src/RemoteDock.cpp b/src/RemoteDock.cpp
index f53c9be8..b64f2125 100644
--- a/src/RemoteDock.cpp
+++ b/src/RemoteDock.cpp
@@ -132,3 +132,10 @@ void RemoteDock::newDirectoryNode(const QModelIndex& parent)
         }
     }
 }
+
+void RemoteDock::reject()
+{
+    // We override this, to ensure the Escape key doesn't make this dialog
+    // dock go away
+    return;
+}
diff --git a/src/RemoteDock.h b/src/RemoteDock.h
index ac8649d7..070237de 100644
--- a/src/RemoteDock.h
+++ b/src/RemoteDock.h
@@ -22,6 +22,9 @@ public:
     void reloadSettings();
     void enableButtons();
 
+public slots:
+    virtual void reject();
+
 private slots:
     void setNewIdentity();
     void fetchDatabase(const QModelIndex& idx);