diff --git a/Base.lproj/MainMenu.xib b/Base.lproj/MainMenu.xib
index 7e8e79f9e..7ce9fb503 100644
--- a/Base.lproj/MainMenu.xib
+++ b/Base.lproj/MainMenu.xib
@@ -562,7 +562,7 @@
-
+
diff --git a/Window/MiniWindow.m b/Window/MiniWindow.m
index 0628e6694..85cc62672 100644
--- a/Window/MiniWindow.m
+++ b/Window/MiniWindow.m
@@ -20,9 +20,14 @@
[self setShowsResizeIndicator:NO];
[self setExcludedFromWindowsMenu:YES];
[[self standardWindowButton:NSWindowZoomButton] setEnabled:NO];
+
+ NSUInteger minWidth = 675; // Default width
+ for (NSScreen *screen in NSScreen.screens) {
+ minWidth = MIN(screen.visibleFrame.size.width, minWidth);
+ }
// Disallow height resize.
- [self setContentMinSize:NSMakeSize(675, 0)];
- [self setContentMaxSize:NSMakeSize(CGFLOAT_MAX, 0)];
+ [self setContentMinSize:NSMakeSize(minWidth, 1)];
+ [self setContentMaxSize:NSMakeSize(CGFLOAT_MAX, 1)];
[self setCollectionBehavior:NSWindowCollectionBehaviorFullScreenAuxiliary];
}