2 files changed, 6 insertions, 2 deletions

diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc
index dfdcf32..a387744 100644
--- a/src/FbWinFrame.cc
+++ b/src/FbWinFrame.cc
@@ -701,7 +701,8 @@ void FbWinFrame::setClientWindow(FbTk::FbWindow &win) {
     XChangeWindowAttributes(win.display(), win.window(), CWEventMask|CWDontPropagate, &attrib_set);
 
     m_clientarea.raise();
-    win.show();
+    if (isVisible())
+        win.show();
     win.raise();
     m_window.showSubwindows();
 
diff --git a/src/Window.cc b/src/Window.cc
index d2a6e34..b50ee38 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -677,8 +677,11 @@ void FluxboxWindow::attachClient(WinClient &client, int x, int y) {
     } else {
         if (!focused_win)
             focused_win = screen().focusControl().lastFocusedWindow(*this);
-        if (focused_win)
+        if (focused_win) {
             setCurrentClient(*focused_win, false);
+            if (isIconic() && m_focused)
+                deiconify();
+        }
     }
     frame().reconfigure();
 }