1 files changed, 7 insertions, 5 deletions
diff --git a/src/Window.cc b/src/Window.cc
index 6131ec49..16715c3e 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -1582,8 +1582,6 @@ bool BlackboxWindow::setInputFocus(void) {
   if (focus_mode == F_LocallyActive || focus_mode == F_Passive) {
     XSetInputFocus(blackbox->getXDisplay(), client.window,
                    RevertToPointerRoot, CurrentTime);
-
-    blackbox->setFocusedWindow(this);
   } else {
     /* we could set the focus to none, since the window doesn't accept focus,
      * but we shouldn't set focus to nothing since this would surely make
@@ -2060,9 +2058,13 @@ void BlackboxWindow::setFocusFlag(bool focus) {
 
   if (isFocused())
     blackbox->setFocusedWindow(this);
-  
-  Clientmenu *menu = screen->getWorkspace(blackbox_attrib.workspace)->getMenu();
-  menu->setItemSelected(window_number, isFocused());
+ 
+  if (! flags.iconic) {
+    // iconic windows arent in a workspace menu!
+    Clientmenu *menu =
+      screen->getWorkspace(blackbox_attrib.workspace)->getMenu();
+    menu->setItemSelected(window_number, isFocused());
+  }
 }