diff --git a/lib/awful/tag.lua.in b/lib/awful/tag.lua.in
index 459a5b781..9e0ba6d89 100644
--- a/lib/awful/tag.lua.in
+++ b/lib/awful/tag.lua.in
@@ -346,7 +346,13 @@ end
 
 -- Register standards signals
 capi.client.add_signal("manage", function(c, startup)
-    if not startup then
+    -- If we are not managing this application at startup,
+    -- move it to the screen where the mouse is.
+    -- We only do it for "normal" windows (i.e. no dock, etc).
+    if not startup
+        and c.type ~= "desktop"
+        and c.type ~= "dock"
+        and c.type ~= "splash" then
         if c.transient_for then
             c.screen = c.transient_for.screen
             if not c.sticky then