diff --git a/simple/init.lua b/simple/init.lua
index 706acc8..bf0fffa 100644
--- a/simple/init.lua
+++ b/simple/init.lua
@@ -740,3 +740,17 @@ end
 client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end)
 client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
 -- }}}
+
+
+-- Make sure clients requesting fullscreen get a correct fullscreen geometry
+-- See https://github.com/awesomeWM/awesome/issues/3156
+-- OP: https://github.com/awesomeWM/awesome/issues/1607#issuecomment-298194491
+client.connect_signal("property::fullscreen", function(c)
+    if c.fullscreen then
+        gears.timer.delayed_call(function()
+            if c.valid then
+                c:geometry(c.screen.geometry)
+            end
+        end)
+    end
+end)