Index: workspaces.c
===================================================================
--- workspaces.c	(revision 25048)
+++ workspaces.c	(working copy)
@@ -383,6 +383,13 @@
     {
         if (new_focus)
         {
+            if ((screen_info->params->click_to_focus) && (screen_info->params->raise_on_click))
+            {
+                if (!clientIsTopMost (new_focus))
+                {
+                    clientRaise (new_focus, None);
+                }
+            }
             clientSetFocus (screen_info, new_focus, timestamp, FOCUS_SORT);
         }
         else