diff --git a/gui/builtinContextMenus/__init__.py b/gui/builtinContextMenus/__init__.py
index 59f8f9e35..cf743e714 100644
--- a/gui/builtinContextMenus/__init__.py
+++ b/gui/builtinContextMenus/__init__.py
@@ -15,6 +15,7 @@ from gui.builtinContextMenus import (  # noqa: E402,F401
     # Item info
     itemStats,
     itemMarketJump,
+    fitSystemSecurity,  # Not really an item info but want to keep it here
     shipJump,
     # Generic item manipulations
     itemRemove,
@@ -39,6 +40,4 @@ from gui.builtinContextMenus import (  # noqa: E402,F401
     # Firepower panel
     factorReload,
     targetResists,
-    # Targeting & misc panel
-    fitSystemSecurity,
 )
diff --git a/gui/builtinContextMenus/fitSystemSecurity.py b/gui/builtinContextMenus/fitSystemSecurity.py
index 900bcc493..d92b3a902 100644
--- a/gui/builtinContextMenus/fitSystemSecurity.py
+++ b/gui/builtinContextMenus/fitSystemSecurity.py
@@ -22,10 +22,19 @@ class FitSystemSecurityMenu(ContextMenuUnconditional):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
 
     def display(self, srcContext):
-        return srcContext == 'targetingMiscViewMinimal'
+        if srcContext != "fittingShip":
+            return False
+
+        fitID = self.mainFrame.getActiveFit()
+        fit = Fit.getInstance().getFit(fitID)
+
+        if not fit.isStructure:
+            return
+
+        return True
 
     def getText(self, itmContext):
-        return "System Security Status"
+        return "Citadel System Security"
 
     def addOption(self, menu, optionLabel):
         id = ContextMenuUnconditional.nextID()
diff --git a/gui/statsView.py b/gui/statsView.py
index dc4c0276b..5a98fb92e 100644
--- a/gui/statsView.py
+++ b/gui/statsView.py
@@ -18,7 +18,7 @@
 # =============================================================================
 
 
-class StatsView(object):
+class StatsView:
     views = {}
 
     def __init__(self):