diff --git a/src/gui/windows/advanced_controls.zig b/src/gui/windows/advanced_controls.zig
index b6d4afc7..39ae872f 100644
--- a/src/gui/windows/advanced_controls.zig
+++ b/src/gui/windows/advanced_controls.zig
@@ -15,6 +15,7 @@ const VerticalList = @import("../components/VerticalList.zig");
 
 pub var window = GuiWindow{
 	.contentSize = Vec2f{128, 256},
+	.closeIfMouseIsGrabbed = true,
 };
 
 const padding: f32 = 8;
diff --git a/src/gui/windows/change_name.zig b/src/gui/windows/change_name.zig
index 127b866e..8b615727 100644
--- a/src/gui/windows/change_name.zig
+++ b/src/gui/windows/change_name.zig
@@ -14,6 +14,7 @@ const VerticalList = @import("../components/VerticalList.zig");
 
 pub var window = GuiWindow{
 	.contentSize = Vec2f{128, 256},
+	.closeIfMouseIsGrabbed = true,
 };
 var textComponent: *TextInput = undefined;
 
diff --git a/src/gui/windows/controls.zig b/src/gui/windows/controls.zig
index 43b715d7..11114170 100644
--- a/src/gui/windows/controls.zig
+++ b/src/gui/windows/controls.zig
@@ -14,6 +14,7 @@ const ContinuousSlider = @import("../components/ContinuousSlider.zig");
 
 pub var window = GuiWindow{
 	.contentSize = Vec2f{128, 192},
+	.closeIfMouseIsGrabbed = true,
 };
 
 const padding: f32 = 8;
diff --git a/src/gui/windows/graphics.zig b/src/gui/windows/graphics.zig
index 1284c001..d941858c 100644
--- a/src/gui/windows/graphics.zig
+++ b/src/gui/windows/graphics.zig
@@ -15,6 +15,7 @@ const VerticalList = @import("../components/VerticalList.zig");
 
 pub var window = GuiWindow{
 	.contentSize = Vec2f{128, 256},
+	.closeIfMouseIsGrabbed = true,
 };
 
 const padding: f32 = 8;
diff --git a/src/gui/windows/manage_players.zig b/src/gui/windows/manage_players.zig
index f39af948..336dc863 100644
--- a/src/gui/windows/manage_players.zig
+++ b/src/gui/windows/manage_players.zig
@@ -16,6 +16,7 @@ const HorizontalList = @import("../components/HorizontalList.zig");
 
 pub var window = GuiWindow{
 	.contentSize = Vec2f{128, 256},
+	.closeIfMouseIsGrabbed = true,
 };
 
 const padding: f32 = 8;
diff --git a/src/gui/windows/pause.zig b/src/gui/windows/pause.zig
index cb564d88..b7bf85fd 100644
--- a/src/gui/windows/pause.zig
+++ b/src/gui/windows/pause.zig
@@ -11,6 +11,7 @@ const VerticalList = @import("../components/VerticalList.zig");
 
 pub var window = GuiWindow{
 	.contentSize = Vec2f{128, 256},
+	.closeIfMouseIsGrabbed = true,
 };
 
 const padding: f32 = 8;
diff --git a/src/gui/windows/settings.zig b/src/gui/windows/settings.zig
index f2330941..45f623d3 100644
--- a/src/gui/windows/settings.zig
+++ b/src/gui/windows/settings.zig
@@ -11,6 +11,7 @@ const VerticalList = @import("../components/VerticalList.zig");
 
 pub var window: GuiWindow = GuiWindow{
 	.contentSize = Vec2f{128, 256},
+	.closeIfMouseIsGrabbed = true,
 };
 
 const padding: f32 = 8;
diff --git a/src/gui/windows/sound.zig b/src/gui/windows/sound.zig
index 1a25349d..c1349a96 100644
--- a/src/gui/windows/sound.zig
+++ b/src/gui/windows/sound.zig
@@ -14,6 +14,7 @@ const VerticalList = @import("../components/VerticalList.zig");
 
 pub var window = GuiWindow{
 	.contentSize = Vec2f{128, 256},
+	.closeIfMouseIsGrabbed = true,
 };
 
 fn musicCallback(newValue: f32) void {