diff --git a/src/workspace.js b/src/workspace.js
index 59f165c45..37ebd7d50 100644
--- a/src/workspace.js
+++ b/src/workspace.js
@@ -471,7 +471,9 @@ module.exports = class Workspace extends Model {
   }
 
   didHideDock (dock) {
-    if (dock === this.activePaneContainer) {
+    const {activeElement} = document
+    const dockElement = dock.getElement()
+    if (dockElement === activeElement || dockElement.contains(activeElement)) {
       this.getCenter().activate()
     }
   }