3 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 37cd23a..a37fe57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
  (Format: Year/Month/Day)
 Changes for 1.1:
 *07/06/03:
+   * Deiconify when automatically tabbing to a minimized window with focus new
+     windows on, bug #1716899 (Mark)
+     Window.cc FbWinFrame.cc
    * Submenus of slit menu were misbehaving with xinerama (Mark)
      Slit.cc
    * Also send transient windows when sending a window to another workspace, bug
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();
 }