diff --git a/src/bin/e_focus.c b/src/bin/e_focus.c
index 565063e9c..0318b3cd9 100644
--- a/src/bin/e_focus.c
+++ b/src/bin/e_focus.c
@@ -112,6 +112,11 @@ e_focus_event_focus_in(E_Border *bd)
         e_bindings_wheel_grab(E_BINDING_CONTEXT_WINDOW, bd->win);
         bd->button_grabbed = 0;
      }
+   if (!bd->lock_user_stacking)
+     {
+        if (e_config->border_raise_on_focus)
+          e_border_raise(bd);
+     }
 }
 
 EAPI void