diff --git a/lib/awful/rules.lua.in b/lib/awful/rules.lua.in
index 8891d4400..d8bdbdad7 100644
--- a/lib/awful/rules.lua.in
+++ b/lib/awful/rules.lua.in
@@ -204,7 +204,7 @@ function rules.apply(c)
     -- Do this at last so we do not erase things done by the focus
     -- signal.
     if props.focus and (type(props.focus) ~= "function" or props.focus(c)) then
-        client.focus = c
+        client.emit_signal('request::activate', c)
     end
 end
 
diff --git a/objects/client.c b/objects/client.c
index bb7fce731..b36e26bde 100644
--- a/objects/client.c
+++ b/objects/client.c
@@ -549,7 +549,7 @@ HANDLE_GEOM(height)
     ewmh_client_check_hints(c);
 
     /* Push client in stack */
-    client_raise(c);
+    stack_client_push(c);
 
     /* Always stay in NORMAL_STATE. Even though iconified seems more
      * appropriate sometimes. The only possible loss is that clients not using