diff --git a/gui/builtinContextMenus/additionsExportAll.py b/gui/builtinContextMenus/additionsExportAll.py
index e9aa83876..fdee9ef2f 100644
--- a/gui/builtinContextMenus/additionsExportAll.py
+++ b/gui/builtinContextMenus/additionsExportAll.py
@@ -3,6 +3,7 @@ from gui.contextMenu import ContextMenuUnconditional
 from gui.utils.clipboard import toClipboard
 from service.fit import Fit
 from service.port.eft import exportDrones, exportFighters, exportCargo, exportImplants, exportBoosters
+from service.settings import ContextMenuSettings
 
 
 viewSpecMap = {
@@ -20,6 +21,8 @@ class AdditionsExportAll(ContextMenuUnconditional):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
 
     def display(self, callingWindow, srcContext):
+        if not ContextMenuSettings.getInstance().get('additionsCopyPaste'):
+            return False
         if srcContext not in viewSpecMap:
             return False
         fit = Fit.getInstance().getFit(self.mainFrame.getActiveFit())
diff --git a/gui/builtinContextMenus/additionsExportSelection.py b/gui/builtinContextMenus/additionsExportSelection.py
index 81481e315..aae7f95d1 100644
--- a/gui/builtinContextMenus/additionsExportSelection.py
+++ b/gui/builtinContextMenus/additionsExportSelection.py
@@ -3,6 +3,7 @@ from gui.contextMenu import ContextMenuSelection
 from gui.utils.clipboard import toClipboard
 from service.fit import Fit
 from service.port.eft import exportDrones, exportFighters, exportCargo, exportImplants, exportBoosters
+from service.settings import ContextMenuSettings
 
 
 viewSpecMap = {
@@ -20,6 +21,8 @@ class AdditionsExportAll(ContextMenuSelection):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
 
     def display(self, callingWindow, srcContext, selection):
+        if not ContextMenuSettings.getInstance().get('additionsCopyPaste'):
+            return False
         if srcContext not in viewSpecMap:
             return False
         if not selection:
diff --git a/gui/builtinPreferenceViews/pyfaContextMenuPreferences.py b/gui/builtinPreferenceViews/pyfaContextMenuPreferences.py
index a7efec4c9..b7add629e 100644
--- a/gui/builtinPreferenceViews/pyfaContextMenuPreferences.py
+++ b/gui/builtinPreferenceViews/pyfaContextMenuPreferences.py
@@ -64,17 +64,22 @@ class PFContextMenuPref(PreferenceView):
         rbSizerRow2.Add(self.rbBox5, 1, wx.ALL, 5)
         self.rbBox5.Bind(wx.EVT_RADIOBOX, self.OnSetting5Change)
 
-        self.rbBox6 = wx.RadioBox(panel, -1, "Spoolup", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS)
-        self.rbBox6.SetSelection(self.settings.get('spoolup'))
-        rbSizerRow2.Add(self.rbBox6, 1, wx.ALL, 5)
-        self.rbBox6.Bind(wx.EVT_RADIOBOX, self.OnSetting6Change)
-
         mainSizer.Add(rbSizerRow2, 1, wx.ALL | wx.EXPAND, 0)
 
         # Row 3
-        # rbSizerRow3 = wx.BoxSizer(wx.HORIZONTAL)
-        #
-        # mainSizer.Add(rbSizerRow3, 1, wx.ALL | wx.EXPAND, 0)
+        rbSizerRow3 = wx.BoxSizer(wx.HORIZONTAL)
+
+        self.rbBox6 = wx.RadioBox(panel, -1, "Spoolup", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS)
+        self.rbBox6.SetSelection(self.settings.get('spoolup'))
+        rbSizerRow3.Add(self.rbBox6, 1, wx.ALL, 5)
+        self.rbBox6.Bind(wx.EVT_RADIOBOX, self.OnSetting6Change)
+
+        self.rbBox7 = wx.RadioBox(panel, -1, "Additions Panel Copy/Paste", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS)
+        self.rbBox7.SetSelection(self.settings.get('additionsCopyPaste'))
+        rbSizerRow3.Add(self.rbBox7, 1, wx.ALL, 5)
+        self.rbBox7.Bind(wx.EVT_RADIOBOX, self.OnSetting7Change)
+
+        mainSizer.Add(rbSizerRow3, 1, wx.ALL | wx.EXPAND, 0)
 
         panel.SetSizer(mainSizer)
         panel.Layout()
@@ -97,6 +102,9 @@ class PFContextMenuPref(PreferenceView):
     def OnSetting6Change(self, event):
         self.settings.set('spoolup', event.GetInt())
 
+    def OnSetting7Change(self, event):
+        self.settings.set('additionsCopyPaste', event.GetInt())
+
     def getImage(self):
         return BitmapLoader.getBitmap("settings_menu", "gui")
 
diff --git a/service/settings.py b/service/settings.py
index 7e870f911..d8e5d0927 100644
--- a/service/settings.py
+++ b/service/settings.py
@@ -474,6 +474,7 @@ class ContextMenuSettings:
             "project"               : 1,
             "moduleFill"            : 1,
             "spoolup"               : 1,
+            "additionsCopyPaste"    : 1,
         }
 
         self.ContextMenuDefaultSettings = SettingsProvider.getInstance().getSettings("pyfaContextMenuSettings", ContextMenuDefaultSettings)