2 files changed, 2 insertions, 2 deletions

diff --git a/src/Screen.cc b/src/Screen.cc
index c0d0706..a827f92 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1413,8 +1413,9 @@ FluxboxWindow *BScreen::createWindow(WinClient &client) {
         return 0;
     }
 
+    // can't setInputFocus yet and mapNotifyEvent doesn't happen for the client
     if (focusControl().focusNew() || FocusControl::focusedWindow() == &client)
-        win->setInputFocus();
+        FocusControl::setFocusedWindow(&client);
 
     m_clientlist_sig.notify();
 
diff --git a/src/Window.cc b/src/Window.cc
index d9c273a..6310ce1 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -764,7 +764,6 @@ bool FluxboxWindow::detachClient(WinClient &client) {
     // m_client must be valid as there should be at least one other window
     // otherwise this wouldn't be here (refer numClients() <= 1 return)
     client.setFluxboxWindow(screen().createWindow(client));
-    m_client->raise();
     return true;
 }