M src/Window.cc → src/Window.cc

@@ -1541,8 +1541,8 @@ 
 bool BlackboxWindow::setInputFocus(void) {
   if (flags.focused) return True;
 
-  assert((flags.stuck ||  // window must be on the current workspace or sticky
-          blackbox_attrib.workspace == screen->getCurrentWorkspaceID()));
+  assert(flags.stuck ||  // window must be on the current workspace or sticky
+         blackbox_attrib.workspace == screen->getCurrentWorkspaceID());
 
   /*
      We only do this check for normal windows and dialogs because other windows

M src/blackbox.cc → src/blackbox.cc

@@ -328,7 +328,8 @@ win->shade();
         focus = True;
       }
 
-      if (focus && (win->isTransient() || win->getScreen()->doFocusNew()))
+      if (focus && (win->isTransient() || win->getScreen()->doFocusNew()) &&
+          win->isVisible())
         win->setInputFocus();
     } else {
       BScreen *screen = searchScreen(e->xmaprequest.parent);