diff --git a/geometry.cpp b/geometry.cpp
index 2c7d73471c..805bf43c1f 100644
--- a/geometry.cpp
+++ b/geometry.cpp
@@ -1330,6 +1330,7 @@ void Client::setFullScreen( bool set, bool user )
         return;
     if( user && !userCanSetFullScreen())
         return;
+    setShade( ShadeNone );
     bool was_fs = isFullScreen();
     if( !was_fs )
         geom_fs_restore = geometry();