2 files changed, 9 insertions, 18 deletions

diff --git a/src/CommandDialog.cc b/src/CommandDialog.cc
index 3746b98..8534dcd 100644
--- a/src/CommandDialog.cc
+++ b/src/CommandDialog.cc
@@ -93,11 +93,6 @@ void CommandDialog::show() {
 void CommandDialog::hide() {
     FbTk::FbWindow::hide();
     Fluxbox::instance()->setShowingDialog(false);
-
-    // return focus to fluxbox window
-    if (FocusControl::focusedFbWindow())
-        FocusControl::focusedFbWindow()->focus();
-
 }
 
 void CommandDialog::exposeEvent(XExposeEvent &event) {
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index db337ad..1c3b783 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -884,23 +884,19 @@ void Fluxbox::handleUnmapNotify(XUnmapEvent &ue) {
         return;
     }
 
-    WinClient *winclient = 0;
+    WinClient *winclient = searchWindow(ue.window);
 
-    if ((winclient = searchWindow(ue.window)) != 0) {
-
-        if (winclient != 0) {
-            FluxboxWindow *win = winclient->fbwindow();
-
-            if (!win) {
-                delete winclient;
-                return;
-            }
-
-            // this should delete client and adjust m_focused_window if necessary
-            win->unmapNotifyEvent(ue);
+    if (winclient != 0) {
 
+        FluxboxWindow *win = winclient->fbwindow();
+        if (!win) {
+            delete winclient;
+            return;
         }
 
+        // this should delete client and adjust m_focused_window if necessary
+        win->unmapNotifyEvent(ue);
+
     // according to http://tronche.com/gui/x/icccm/sec-4.html#s-4.1.4
     // a XWithdrawWindow is
     //   1) unmapping the window (which leads to the upper branch