diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 76a3de6..93b8813 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -15,6 +15,7 @@ local naughty = require("naughty")
 local menubar = require("menubar")
 local hotkeys_popup = require("awful.hotkeys_popup")
 local vicious = require("vicious")
+local timer = require("gears.timer")
 -- Enable hotkeys help widget for VIM and other apps
 -- when client with a matching name is opened:
 require("awful.hotkeys_popup.keys")
@@ -251,18 +252,17 @@ awful.screen.connect_for_each_screen(function(s)
         },
     }
 
-    local timer = require("gears.timer")
-    local dock_trigger = wibox({ bg = "#00000000", opacity = 0, ontop = true, visible = true })
-    local dock_hide_timer = timer({ timeout = 1})
+    s.dock_trigger = wibox({ bg = "#00000000", opacity = 0, ontop = true, visible = true })
+    s.dock_hide_timer = timer({ timeout = 1})
 
-    dock_trigger:geometry({ width = 10, height = 10 })
-    dock_hide_timer:connect_signal("timeout", function() stopgaps(s.mywibox) end )
+    s.dock_trigger:geometry({ width = 10, height = 10 })
+    s.dock_hide_timer:connect_signal("timeout", function() stopgaps(s.mywibox) end )
 
-    dock_trigger:connect_signal("mouse::enter", function() startgaps(s.mywibox) end)
-    s.mywibox:connect_signal("mouse::enter", function() if dock_hide_timer.started then dock_hide_timer:stop() end end)
-    s.mywibox:connect_signal("mouse::leave", function() dock_hide_timer:again() end)
-    dock_trigger:connect_signal("mouse::enter", function() if dock_hide_timer.started then dock_hide_timer:stop() end end)
-    dock_trigger:connect_signal("mouse::leave", function() dock_hide_timer:again() end)
+    s.dock_trigger:connect_signal("mouse::enter", function() startgaps(s.mywibox) end)
+    s.mywibox:connect_signal("mouse::enter", function() if s.dock_hide_timer.started then s.dock_hide_timer:stop() end end)
+    s.mywibox:connect_signal("mouse::leave", function() s.dock_hide_timer:again() end)
+    s.dock_trigger:connect_signal("mouse::enter", function() if s.dock_hide_timer.started then s.dock_hide_timer:stop() end end)
+    s.dock_trigger:connect_signal("mouse::leave", function() s.dock_hide_timer:again() end)
 end)
 -- }}}
 
@@ -319,7 +319,7 @@ globalkeys = gears.table.join(
         awful.spawn("xbacklight -dec 5")
     end),
 
-    awful.key({ modkey }, "g", function () for s in screen do togglegaps(s.mywibox) end end),
+    awful.key({ modkey }, "g", function () for s in screen do togglegaps(s.mywibox); s.dock_hide_timer:stop() end end),
     awful.key({ modkey,           }, "s",      hotkeys_popup.show_help,
               {description="show help", group="awesome"}),
     awful.key({ modkey,           }, "Left",   awful.tag.viewprev,