2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 283bb9d..f43c672 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 (Format: Year/Month/Day)
 Changes for 0.9.16:
 *06/04/23:
+   * Focus singular windows on a workspace (Simon / thanks Jonas Koelker)
+     sf.net patch #1474722
+     Window.cc
    * Tidy up window cycling, and make linear mode work in order of 
      creation (Thanks Mark Tiefenbruck, mark at tiefenbruck dot org)
      FocusControl.hh/cc
diff --git a/src/Window.cc b/src/Window.cc
index 4ced1c6..7ffc1d5 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -1546,7 +1546,8 @@ void FluxboxWindow::deiconify(bool reassoc, bool do_raise) {
 
     show();
 
-    if (was_iconic && screen().focusControl().focusNew())
+    // focus new, OR if it's the only window on the workspace
+    if (was_iconic && (screen().focusControl().focusNew() || screen().currentWorkspace()->numberOfWindows() == 1))
         setInputFocus();