diff --git a/src/bin/e_focus.c b/src/bin/e_focus.c
index 24cc3e9d5..28fb473c2 100644
--- a/src/bin/e_focus.c
+++ b/src/bin/e_focus.c
@@ -63,10 +63,13 @@ e_focus_event_mouse_out(E_Border *bd)
 EAPI void
 e_focus_event_mouse_down(E_Border *bd)
 {
-   if (e_config->focus_policy == E_FOCUS_CLICK)
-     e_border_focus_set(bd, 1, 1);
-   else if (e_config->always_click_to_focus)
-     e_border_focus_set(bd, 1, 1);
+   if (!bd->focused)
+     {
+        if (e_config->focus_policy == E_FOCUS_CLICK)
+          e_border_focus_set(bd, 1, 1);
+        else if (e_config->always_click_to_focus)
+          e_border_focus_set(bd, 1, 1);
+     }
    if (e_config->always_click_to_raise)
      {
         if (!bd->lock_user_stacking)