diff --git a/gui/additionsPane.py b/gui/additionsPane.py
index 8bc72f8ec..f9b48d50f 100644
--- a/gui/additionsPane.py
+++ b/gui/additionsPane.py
@@ -34,6 +34,7 @@ from gui.toggle_panel import TogglePanel
 
 
 class AdditionsPane(TogglePanel):
+
     def __init__(self, parent):
 
         TogglePanel.__init__(self, parent, force_layout=1)
@@ -86,8 +87,8 @@ class AdditionsPane(TogglePanel):
 
     PANES = ["Drones", "Fighters", "Cargo", "Implants", "Boosters", "Projected", "Command", "Notes"]
 
-    def select(self, name):
-        self.notebook.SetSelection(self.PANES.index(name))
+    def select(self, name, focus=True):
+        self.notebook.SetSelection(self.PANES.index(name), focus=focus)
 
     def getName(self, idx):
         return self.PANES[idx]
diff --git a/gui/builtinContextMenus/cargoAdd.py b/gui/builtinContextMenus/cargoAdd.py
index 8f094f79c..ec0e54a8c 100644
--- a/gui/builtinContextMenus/cargoAdd.py
+++ b/gui/builtinContextMenus/cargoAdd.py
@@ -35,7 +35,7 @@ class AddToCargo(ContextMenuSingle):
         typeID = int(mainItem.ID)
         command = cmd.GuiAddCargoCommand(fitID=fitID, itemID=typeID, amount=1)
         if self.mainFrame.command.Submit(command):
-            self.mainFrame.additionsPane.select("Cargo")
+            self.mainFrame.additionsPane.select("Cargo", focus=False)
 
 
 AddToCargo.register()
diff --git a/gui/builtinContextMenus/cargoAddAmmo.py b/gui/builtinContextMenus/cargoAddAmmo.py
index 321ff4cba..309d80b16 100644
--- a/gui/builtinContextMenus/cargoAddAmmo.py
+++ b/gui/builtinContextMenus/cargoAddAmmo.py
@@ -30,7 +30,7 @@ class AddToCargoAmmo(ContextMenuSingle):
         typeID = int(mainItem.ID)
         command = cmd.GuiAddCargoCommand(fitID=fitID, itemID=typeID, amount=1000)
         if self.mainFrame.command.Submit(command):
-            self.mainFrame.additionsPane.select("Cargo")
+            self.mainFrame.additionsPane.select("Cargo", focus=False)
 
 
 AddToCargoAmmo.register()
diff --git a/gui/builtinContextMenus/droneAddStack.py b/gui/builtinContextMenus/droneAddStack.py
index b8d6631f7..4a9b066c7 100644
--- a/gui/builtinContextMenus/droneAddStack.py
+++ b/gui/builtinContextMenus/droneAddStack.py
@@ -44,7 +44,7 @@ class DroneAddStack(ContextMenuSingle):
             itemID=int(mainItem.ID),
             amount=self.amount)
         if self.mainFrame.command.Submit(command):
-            self.mainFrame.additionsPane.select('Drones')
+            self.mainFrame.additionsPane.select('Drones', focus=False)
 
 
 DroneAddStack.register()
diff --git a/gui/builtinContextMenus/itemFill.py b/gui/builtinContextMenus/itemFill.py
index fe5b964de..c172227f2 100644
--- a/gui/builtinContextMenus/itemFill.py
+++ b/gui/builtinContextMenus/itemFill.py
@@ -35,7 +35,6 @@ class FillWithItem(ContextMenuSingle):
         self.mainFrame.command.Submit(cmd.GuiFillWithNewLocalModulesCommand(
             fitID=self.mainFrame.getActiveFit(),
             itemID=int(mainItem.ID)))
-        self.mainFrame.additionsPane.select('Drones')
 
 
 FillWithItem.register()
diff --git a/gui/builtinContextMenus/itemProject.py b/gui/builtinContextMenus/itemProject.py
index 961b62984..2b297403e 100644
--- a/gui/builtinContextMenus/itemProject.py
+++ b/gui/builtinContextMenus/itemProject.py
@@ -45,7 +45,7 @@ class ProjectItem(ContextMenuSingle):
         else:
             success = False
         if success:
-            self.mainFrame.additionsPane.select('Projected')
+            self.mainFrame.additionsPane.select('Projected', focus=False)
 
 
 ProjectItem.register()
diff --git a/gui/builtinStatsViews/resourcesViewFull.py b/gui/builtinStatsViews/resourcesViewFull.py
index 4783d7bfc..6c681db8b 100644
--- a/gui/builtinStatsViews/resourcesViewFull.py
+++ b/gui/builtinStatsViews/resourcesViewFull.py
@@ -49,6 +49,7 @@ class ResourcesViewFull(StatsView):
             self.toggleContext("fighter")
         else:
             self.toggleContext("drone")
+        event.Skip()
 
     def toggleContext(self, context):
         # Apparently you cannot .Hide(True) on a Window, otherwise I would just .Hide(context !== x).
diff --git a/gui/chrome_tabs.py b/gui/chrome_tabs.py
index f117631fb..6558fe263 100644
--- a/gui/chrome_tabs.py
+++ b/gui/chrome_tabs.py
@@ -64,8 +64,9 @@ class PageChanging(_PageChanging, NotebookTabChangeEvent, VetoAble):
 
 
 class PageChanged(_PageChanged, NotebookTabChangeEvent):
-    def __init__(self, old, new):
-        _PageChanged.__init__(self)
+
+    def __init__(self, old, new, *args, **kwargs):
+        _PageChanged.__init__(self, *args, **kwargs)
         NotebookTabChangeEvent.__init__(self, old, new)
 
 
@@ -236,13 +237,15 @@ class ChromeNotebook(wx.Panel):
 
         self.tabs_container.DisableTab(idx, toggle)
 
-    def SetSelection(self, page):
+    def SetSelection(self, page, focus=True):
         old_selection = self.GetSelection()
         if old_selection != page:
             self._active_page.Hide()
             self._active_page = self._pages[page]
             self.tabs_container.SetSelected(page)
             self.ShowActive()
+            if focus:
+                self._active_page.SetFocus()
             wx.PostEvent(self, PageChanged(old_selection, page))
 
     def DeletePage(self, n):