diff --git a/core/layouts/widget.lua b/core/layouts/widget.lua
index 207f1f4..d8bb32a 100755
--- a/core/layouts/widget.lua
+++ b/core/layouts/widget.lua
@@ -1,3 +1,5 @@
+local layoutmanager = require("core.layouts.layoutmanager")
+
 local make = function(screen)
 	local widget
 
diff --git a/core/start.lua b/core/start.lua
index db6b972..f31e85f 100755
--- a/core/start.lua
+++ b/core/start.lua
@@ -210,7 +210,7 @@ local function start()
 						desktop.widgets.launcher,
 
 						desktop.widgets.space(18),
-						s.tagger.widget,
+						s.tagger.widget.widget,
 						make_layoutbox(s),
 
 						s.shortcuts,
diff --git a/core/tagger/tagger.lua b/core/tagger/tagger.lua
index e0f9f53..9dbb249 100755
--- a/core/tagger/tagger.lua
+++ b/core/tagger/tagger.lua
@@ -1,9 +1,15 @@
 -- Tag grid manager
 
-local widget = require("core.tagger.widget")
+local make_widget = require("core.tagger.widget")
+local layoutmanager = require("core.layouts.layoutmanager")
 
 local Tagger = {
-	screen = nil, rows = 2, cols = 4
+	rows = 2,
+	cols = 4,
+
+	-- Defined per-instance
+	screen = nil,
+	widget = nil,
 }
 Tagger.__index = Tagger
 
@@ -29,7 +35,7 @@ function Tagger:new(screen)
 		end
 	end
 
-	t.widget = widget(t)
+	t.widget = make_widget(t)
 	return t
 end
 
diff --git a/core/tagger/widget.lua b/core/tagger/widget.lua
index 8a94ce7..dee5c6e 100755
--- a/core/tagger/widget.lua
+++ b/core/tagger/widget.lua
@@ -1,4 +1,4 @@
-local make = function(tagger)
+local function make(tagger)
 	local widget = {}
 
 	-- Create tag tagindicators
@@ -53,11 +53,11 @@ local make = function(tagger)
 
 	-- Change background when mouse is over widget
 	widget.widget:connect_signal("mouse::enter", function(result)
-		widget.bg = beautiful.color.bar.hover_bg
+		widget.widget.bg = beautiful.color.bar.hover_bg
 	end)
 
 	widget.widget:connect_signal("mouse::leave", function(result)
-		widget.bg = beautiful.color.transparent
+		widget.widget.bg = beautiful.color.transparent
 	end)
 
 	return widget