diff --git a/gui/builtinContextMenus/droneSplit.py b/gui/builtinContextMenus/droneSplit.py
index 689e469d5..0ae722f50 100755
--- a/gui/builtinContextMenus/droneSplit.py
+++ b/gui/builtinContextMenus/droneSplit.py
@@ -32,7 +32,7 @@ class DroneSpinner(wx.Dialog):
         bSizer1 = wx.BoxSizer(wx.HORIZONTAL)
 
         self.spinner = wx.SpinCtrl(self)
-        self.spinner.SetRange(1, drone.amount)
+        self.spinner.SetRange(1, drone.amount - 1)
         self.spinner.SetValue(1)
 
         bSizer1.Add(self.spinner, 0, wx.ALL, 5)
diff --git a/gui/mainMenuBar.py b/gui/mainMenuBar.py
index 5c827a310..724e9a78a 100644
--- a/gui/mainMenuBar.py
+++ b/gui/mainMenuBar.py
@@ -32,7 +32,10 @@ class MainMenuBar(wx.MenuBar):
         # File menu
         fileMenu = wx.Menu()
         self.Append(fileMenu, "&File")
-        fileMenu.Append(wx.ID_CLOSE)
+        if 'wxMSW' in wx.PlatformInfo:
+            fileMenu.Append(wx.ID_CLOSE, "&Close\tCTRL+W", "Close the currently open fit")
+        else:
+            fileMenu.Append(wx.ID_CLOSE)
         fileMenu.Append(wx.ID_EXIT)