diff --git a/eos/saveddata/fighter.py b/eos/saveddata/fighter.py
index 48eb3625a..de550111e 100644
--- a/eos/saveddata/fighter.py
+++ b/eos/saveddata/fighter.py
@@ -104,7 +104,10 @@ class Fighter(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
         types = {
             "Light"  : Slot.F_LIGHT,
             "Support": Slot.F_SUPPORT,
-            "Heavy"  : Slot.F_HEAVY
+            "Heavy"  : Slot.F_HEAVY,
+            "StandupLight": Slot.FS_LIGHT,
+            "StandupSupport": Slot.FS_SUPPORT,
+            "StandupHeavy":Slot.FS_HEAVY
         }
 
         for t, slot in types.iteritems():
diff --git a/eos/saveddata/fit.py b/eos/saveddata/fit.py
index 6397e4047..efb094966 100644
--- a/eos/saveddata/fit.py
+++ b/eos/saveddata/fit.py
@@ -917,7 +917,7 @@ class Fit(object):
 
         for mod in chain(self.modules, self.fighters):
             if mod.slot is type and (not getattr(mod, "isEmpty", False) or countDummies):
-                if type in (Slot.F_HEAVY, Slot.F_SUPPORT, Slot.F_LIGHT) and not mod.active:
+                if type in (Slot.F_HEAVY, Slot.F_SUPPORT, Slot.F_LIGHT, Slot.FS_HEAVY, Slot.FS_LIGHT, Slot.FS_SUPPORT) and not mod.active:
                     continue
                 amount += 1
 
@@ -932,7 +932,10 @@ class Fit(object):
         Slot.SERVICE  : "serviceSlots",
         Slot.F_LIGHT  : "fighterLightSlots",
         Slot.F_SUPPORT: "fighterSupportSlots",
-        Slot.F_HEAVY  : "fighterHeavySlots"
+        Slot.F_HEAVY  : "fighterHeavySlots",
+        Slot.FS_LIGHT: "fighterStandupLightSlots",
+        Slot.FS_SUPPORT: "fighterStandupSupportSlots",
+        Slot.FS_HEAVY: "fighterStandupHeavySlots",
     }
 
     def getSlotsFree(self, type, countDummies=False):
diff --git a/eos/saveddata/module.py b/eos/saveddata/module.py
index c032c23e8..e75d8b075 100644
--- a/eos/saveddata/module.py
+++ b/eos/saveddata/module.py
@@ -56,7 +56,10 @@ class Slot(Enum):
     F_LIGHT = 10
     F_SUPPORT = 11
     F_HEAVY = 12
-
+    # fighter 'slots' (for structures)
+    FS_LIGHT = 13
+    FS_SUPPORT = 14
+    FS_HEAVY = 15
 
 class Hardpoint(Enum):
     NONE = 0
diff --git a/gui/builtinAdditionPanes/fighterView.py b/gui/builtinAdditionPanes/fighterView.py
index f3b4aea1f..3e7017794 100644
--- a/gui/builtinAdditionPanes/fighterView.py
+++ b/gui/builtinAdditionPanes/fighterView.py
@@ -91,7 +91,10 @@ class FighterView(wx.Panel):
 
         if fit:
             for x in self.labels:
-                slot = getattr(Slot, "F_{}".format(x.upper()))
+                if fit.isStructure:
+                    slot = getattr(Slot, "FS_{}".format(x.upper()))
+                else:
+                    slot = getattr(Slot, "F_{}".format(x.upper()))
                 used = fit.getSlotsUsed(slot)
                 total = fit.getNumSlots(slot)
                 color = wx.Colour(204, 51, 51) if used > total else wx.SystemSettings_GetColour(