M src/Ewmh.cc → src/Ewmh.cc

@@ -328,6 +328,8 @@ win.winClient().
                 changeProperty(m_net_wm_window_type,
                                XA_ATOM, 32, PropModeReplace,
                                (unsigned char*)&m_net_wm_window_type_dialog, 1);
+            // and then we should treat it like a dialog
+            win.setTabable(false);
         }
     }
 

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

@@ -1887,7 +1887,8 @@ }
     // raise this window and every transient in it with this one last
     if (client->fbwindow()) {
         // doing this on startup messes up the focus order
-        if (!Fluxbox::instance()->isStartup())
+        if (!Fluxbox::instance()->isStartup() && client->fbwindow() != this &&
+                &client->fbwindow()->winClient() != client)
             // activate the client so the transient won't get pushed back down
             client->fbwindow()->setCurrentClient(*client, false);
         raiseFluxboxWindow(*client->fbwindow());