diff --git a/gui/builtinPreferenceViews/pyfaGeneralPreferences.py b/gui/builtinPreferenceViews/pyfaGeneralPreferences.py
index 98190fcde..60468ec9a 100644
--- a/gui/builtinPreferenceViews/pyfaGeneralPreferences.py
+++ b/gui/builtinPreferenceViews/pyfaGeneralPreferences.py
@@ -53,6 +53,9 @@ class PFGeneralPref ( PreferenceView):
         labelSizer.Add( self.cbRackLabels, 0, wx.ALL|wx.EXPAND, 5 )
         mainSizer.Add( labelSizer, 0, wx.LEFT|wx.EXPAND, 30 )
 
+        self.cbShowTooltip = wx.CheckBox( panel, wx.ID_ANY, u"Show tab tooltips", wx.DefaultPosition, wx.DefaultSize, 0 )
+        mainSizer.Add( self.cbShowTooltip, 0, wx.ALL|wx.EXPAND, 5 )
+
         defCharSizer = wx.BoxSizer( wx.HORIZONTAL )
 
         self.sFit = service.Fit.getInstance()
@@ -65,6 +68,7 @@ class PFGeneralPref ( PreferenceView):
         self.cbRackLabels.SetValue(self.sFit.serviceFittingOptions["rackLabels"] or False)
         self.cbCompactSkills.SetValue(self.sFit.serviceFittingOptions["compactSkills"] or False)
         self.cbReopenFits.SetValue(self.openFitsSettings["enabled"])
+        self.cbShowTooltip.SetValue(self.sFit.serviceFittingOptions["showTooltip"] or False)
 
         self.cbGlobalChar.Bind(wx.EVT_CHECKBOX, self.OnCBGlobalCharStateChange)
         self.cbGlobalDmgPattern.Bind(wx.EVT_CHECKBOX, self.OnCBGlobalDmgPatternStateChange)
@@ -74,6 +78,7 @@ class PFGeneralPref ( PreferenceView):
         self.cbRackLabels.Bind(wx.EVT_CHECKBOX, self.onCBGlobalRackLabels)
         self.cbCompactSkills.Bind(wx.EVT_CHECKBOX, self.onCBCompactSkills)
         self.cbReopenFits.Bind(wx.EVT_CHECKBOX, self.onCBReopenFits)
+        self.cbShowTooltip.Bind(wx.EVT_CHECKBOX, self.onCBShowTooltip)
 
         self.cbRackLabels.Enable(self.sFit.serviceFittingOptions["rackSlots"] or False)
 
@@ -127,6 +132,9 @@ class PFGeneralPref ( PreferenceView):
     def onCBReopenFits(self, event):
         self.openFitsSettings["enabled"] = self.cbReopenFits.GetValue()
 
+    def onCBShowTooltip(self, event):
+        self.sFit.serviceFittingOptions["showTooltip"] = self.cbShowTooltip.GetValue()
+
     def getImage(self):
         return bitmapLoader.getBitmap("prefs_settings", "icons")
 
diff --git a/gui/chromeTabs.py b/gui/chromeTabs.py
index 7ea61a2e3..3a0c7b11c 100644
--- a/gui/chromeTabs.py
+++ b/gui/chromeTabs.py
@@ -24,6 +24,8 @@ import gui.utils.drawUtils as drawUtils
 from gui import bitmapLoader
 import gui.utils.fonts as fonts
 
+import service
+
 _PageChanging, EVT_NOTEBOOK_PAGE_CHANGING = wx.lib.newevent.NewEvent()
 _PageChanged, EVT_NOTEBOOK_PAGE_CHANGED = wx.lib.newevent.NewEvent()
 _PageAdding, EVT_NOTEBOOK_PAGE_ADDING = wx.lib.newevent.NewEvent()
@@ -677,6 +679,7 @@ class PFTabsContainer(wx.Panel):
         self.containerHeight = height
         self.startDrag = False
         self.dragging = False
+        self.sFit = service.Fit.getInstance()
 
         self.inclination = 7
         if canAdd:
@@ -1010,6 +1013,9 @@ class PFTabsContainer(wx.Panel):
         Checks to see if we have a tab preview and sets up the timer for it
         to display
         """
+        if not self.sFit.serviceFittingOptions["showTooltip"] or False:
+            return
+
         if self.previewTimer:
             if self.previewTimer.IsRunning():
                 if self.previewWnd:
diff --git a/service/fit.py b/service/fit.py
index 2da369576..5169189ae 100644
--- a/service/fit.py
+++ b/service/fit.py
@@ -94,7 +94,8 @@ class Fit(object):
             "colorFitBySlot": False,
             "rackSlots": True,
             "rackLabels": True,
-            "compactSkills": True}
+            "compactSkills": True,
+            "showTooltip": True}
 
         self.serviceFittingOptions = SettingsProvider.getInstance().getSettings(
             "pyfaServiceFittingOptions", serviceFittingDefaultOptions)