2 files changed, 2 insertions, 2 deletions

diff --git a/src/Screen.cc b/src/Screen.cc
index afbd90f..97ce70b 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1345,7 +1345,7 @@ FluxboxWindow *BScreen::createWindow(Window client) {
 
     // add the window to the focus list
     // always add to front on startup to keep the focus order the same
-    if (focusControl().focusNew() || Fluxbox::instance()->isStartup())
+    if (win->isFocused() || Fluxbox::instance()->isStartup())
         focusControl().addFocusFront(*winclient);
     else
         focusControl().addFocusBack(*winclient);
diff --git a/src/Window.cc b/src/Window.cc
index d16815c..a29ea77 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -283,7 +283,7 @@ FluxboxWindow::FluxboxWindow(WinClient &client, FbWinFrameTheme &tm,
 
     // add the window to the focus list
     // always add to front on startup to keep the focus order the same
-    if (screen().focusControl().focusNew() || Fluxbox::instance()->isStartup())
+    if (m_focused || Fluxbox::instance()->isStartup())
         screen().focusControl().addFocusWinFront(*this);
     else
         screen().focusControl().addFocusWinBack(*this);