diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 966e6a8f1..5ac0fcbf4 100644
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -1948,13 +1948,16 @@ _e_client_eval(E_Client *ec)
 
              e_object_ref(E_OBJECT(ec->cur_mouse_action));
              ec->cur_mouse_action->func.go(E_OBJECT(ec), NULL);
+          }
+        if (evas_object_visible_get(ec->frame))
+          {
              if (e_config->border_raise_on_mouse_action)
                evas_object_raise(ec->frame);
              evas_object_focus_set(ec->frame, 1);
+             ec->changes.visible = 0;
+             rem_change = 1;
+             _e_client_event_simple(ec, E_EVENT_CLIENT_SHOW);
           }
-        ec->changes.visible = 0;
-        rem_change = 1;
-        _e_client_event_simple(ec, E_EVENT_CLIENT_SHOW);
      }
    else if ((ec->changes.visible) && (ec->new_client))
      {