diff --git a/rc/behavior/default/signals.lua b/rc/behavior/default/signals.lua
index e421e26..f27466e 100644
--- a/rc/behavior/default/signals.lua
+++ b/rc/behavior/default/signals.lua
@@ -3,7 +3,7 @@
 -- @Author : Marcel Arpogaus <marcel dot arpogaus at gmail dot com>
 --
 -- @Created: 2021-02-03 16:02:46 (Marcel Arpogaus)
--- @Changed: 2021-02-10 08:21:28 (Marcel Arpogaus)
+-- @Changed: 2021-02-04 09:36:26 (Marcel Arpogaus)
 -- [ description ] -------------------------------------------------------------
 -- ...
 -- [ license ] -----------------------------------------------------------------
@@ -31,7 +31,6 @@ module.init = function(_)
     return {
         -- Signal function to execute when a new client appears.
         client = {
-            ['untagged'] = function(c) c:emit_signal('manage') end,
             ['manage'] = function(c)
                 -- Set the windows at the slave,
                 -- i.e. put it at the end of others instead of setting it master.
diff --git a/rc/behavior/dynamic_tags/rules.lua b/rc/behavior/dynamic_tags/rules.lua
index de67038..16acf7a 100644
--- a/rc/behavior/dynamic_tags/rules.lua
+++ b/rc/behavior/dynamic_tags/rules.lua
@@ -3,7 +3,7 @@
 -- @Author : Marcel Arpogaus <marcel dot arpogaus at gmail dot com>
 --
 -- @Created: 2021-02-03 17:41:25 (Marcel Arpogaus)
--- @Changed: 2021-02-10 08:20:28 (Marcel Arpogaus)
+-- @Changed: 2021-02-06 13:11:38 (Marcel Arpogaus)
 -- [ description ] -------------------------------------------------------------
 -- ...
 -- [ license ] -----------------------------------------------------------------
diff --git a/rc/key_bindings/default/actions.lua b/rc/key_bindings/default/actions.lua
index 0863d74..f54b63c 100644
--- a/rc/key_bindings/default/actions.lua
+++ b/rc/key_bindings/default/actions.lua
@@ -3,7 +3,7 @@
 -- @Author : Marcel Arpogaus <marcel dot arpogaus at gmail dot com>
 --
 -- @Created: 2021-01-27 11:14:55 (Marcel Arpogaus)
--- @Changed: 2021-02-10 08:15:14 (Marcel Arpogaus)
+-- @Changed: 2021-02-09 18:07:29 (Marcel Arpogaus)
 -- [ description ] -------------------------------------------------------------
 -- ...
 -- [ license ] -----------------------------------------------------------------
@@ -151,7 +151,7 @@ module.init = function(config, mainmenu)
             end,
             ['move to screen'] = function(c)
                 c:move_to_screen()
-                c:emit_signal('manage')
+                c:emit_signal('manage', 'key.movetoscreen', {})
                 c:emit_signal('request::activate', 'key.movetoscreen',
                               {raise = true})
             end,
diff --git a/rc/screen/init.lua b/rc/screen/init.lua
index cb2dbcd..33e9050 100644
--- a/rc/screen/init.lua
+++ b/rc/screen/init.lua
@@ -125,7 +125,15 @@ module.init = function(
             collectgarbage()
         end
 
+        s.move_all_clients = function()
+            for _, c in pairs(s:get_all_clients()) do
+                c:move_to_screen()
+                c:emit_signal('manage', 'screen', {})
+            end
+        end
+
         s:connect_signal('removed', s.reset)
+        s:connect_signal('removed', s.move_all_clients)
     end
     awful.screen.connect_for_each_screen(update_screen)
 end