diff --git a/README.md b/README.md
index 5538a8a7..1291216c 100644
--- a/README.md
+++ b/README.md
@@ -118,7 +118,7 @@ information on what to include when reporting a bug.
 
 ## Changelog
 
-There is nothing here yet.
+ - [X11] Bugfix: Some window attributes were not applied on leaving fullscreen
 
 
 ## Contact
diff --git a/src/x11_window.c b/src/x11_window.c
index 90c4d9be..d52ebc4d 100644
--- a/src/x11_window.c
+++ b/src/x11_window.c
@@ -2500,7 +2500,11 @@ void _glfwPlatformSetWindowMonitor(_GLFWwindow* window,
     }
 
     if (window->monitor)
+    {
+        _glfwPlatformSetWindowDecorated(window, window->decorated);
+        _glfwPlatformSetWindowFloating(window, window->floating);
         releaseMonitor(window);
+    }
 
     _glfwInputWindowMonitor(window, monitor);
     updateNormalHints(window, width, height);