diff --git a/src/private/DockRegistry.cpp b/src/private/DockRegistry.cpp
index 40915ec0..86abae6b 100644
--- a/src/private/DockRegistry.cpp
+++ b/src/private/DockRegistry.cpp
@@ -260,6 +260,9 @@ void DockRegistry::registerDockWidget(DockWidgetBase *dock)
 
 void DockRegistry::unregisterDockWidget(DockWidgetBase *dock)
 {
+    if (m_focusedDockWidget == dock)
+        m_focusedDockWidget = nullptr;
+
     m_dockWidgets.removeOne(dock);
     maybeDelete();
 }