diff --git a/client.cpp b/client.cpp
index 631b47087b..d493685896 100644
--- a/client.cpp
+++ b/client.cpp
@@ -2539,7 +2539,7 @@ void Client::getWindowProtocols(){
  */
 void Client::takeFocus( bool force )
 {
-    if ( !force && ( isTopMenu() || isDock() ) )
+    if ( !force && ( isTopMenu() || ( isDock() && staysOnTop() ) ) )
         return; // toplevel menus and dock windows don't take focus if not forced
 
     if ( input ) {