diff --git a/qrenderdoc/Widgets/FindReplace.cpp b/qrenderdoc/Widgets/FindReplace.cpp
index 780318507..1c38d6207 100644
--- a/qrenderdoc/Widgets/FindReplace.cpp
+++ b/qrenderdoc/Widgets/FindReplace.cpp
@@ -160,6 +160,10 @@ void FindReplace::keyPressEvent(QKeyEvent *event)
 
     m_direction = dir;
   }
+  else
+  {
+    emit keyPress(event);
+  }
 }
 
 void FindReplace::addHistory(QComboBox *combo)
diff --git a/qrenderdoc/Widgets/FindReplace.h b/qrenderdoc/Widgets/FindReplace.h
index 6f0ab3c9d..10ebfa76d 100644
--- a/qrenderdoc/Widgets/FindReplace.h
+++ b/qrenderdoc/Widgets/FindReplace.h
@@ -77,6 +77,7 @@ signals:
   void performFindAll();
   void performReplace();
   void performReplaceAll();
+  void keyPress(QKeyEvent *e);
 
 private slots:
   // automatic slots
diff --git a/qrenderdoc/Windows/ShaderViewer.cpp b/qrenderdoc/Windows/ShaderViewer.cpp
index fe97b09b1..6dc9bff7d 100644
--- a/qrenderdoc/Windows/ShaderViewer.cpp
+++ b/qrenderdoc/Windows/ShaderViewer.cpp
@@ -110,12 +110,26 @@ ShaderViewer::ShaderViewer(ICaptureContext &ctx, QWidget *parent)
   QObject::connect(m_FindReplace, &FindReplace::performReplace, this, &ShaderViewer::performReplace);
   QObject::connect(m_FindReplace, &FindReplace::performReplaceAll, this,
                    &ShaderViewer::performReplaceAll);
+  QObject::connect(m_FindReplace, &FindReplace::keyPress, [this](QKeyEvent *e) {
+    if(e->key() == Qt::Key_Escape)
+    {
+      // the find replace dialog is the only thing allowed to float. If it's in a floating area,
+      // hide it on escape
+      ToolWindowManagerArea *area = ui->docking->areaOf(m_FindReplace);
+
+      if(area && ui->docking->isFloating(m_FindReplace))
+      {
+        ui->docking->hideToolWindow(m_FindReplace);
+      }
+    }
+  });
 
   ui->docking->addToolWindow(m_FindReplace, ToolWindowManager::NoArea);
   ui->docking->setToolWindowProperties(m_FindReplace, ToolWindowManager::HideOnClose);
 
   ui->docking->addToolWindow(m_FindResults, ToolWindowManager::NoArea);
-  ui->docking->setToolWindowProperties(m_FindResults, ToolWindowManager::HideOnClose);
+  ui->docking->setToolWindowProperties(
+      m_FindResults, ToolWindowManager::HideOnClose | ToolWindowManager::DisallowFloatWindow);
 
   {
     m_DisassemblyView =
@@ -160,8 +174,6 @@ ShaderViewer::ShaderViewer(ICaptureContext &ctx, QWidget *parent)
                                              ToolWindowManager::AlwaysDisplayFullTabs);
   }
 
-  ui->docking->setAllowFloatingWindow(false);
-
   {
     QMenu *snippetsMenu = new QMenu(this);
 
@@ -5287,7 +5299,8 @@ void ShaderViewer::performFindAll()
     ui->docking->moveToolWindow(m_FindResults,
                                 ToolWindowManager::AreaReference(ToolWindowManager::BottomOf,
                                                                  ui->docking->areaOf(cur), 0.2f));
-    ui->docking->setToolWindowProperties(m_FindResults, ToolWindowManager::HideOnClose);
+    ui->docking->setToolWindowProperties(
+        m_FindResults, ToolWindowManager::HideOnClose | ToolWindowManager::DisallowFloatWindow);
   }
 }