diff --git a/gui/builtinPreferenceViews/pyfaGeneralPreferences.py b/gui/builtinPreferenceViews/pyfaGeneralPreferences.py
index 8a278a048..0be3baddf 100644
--- a/gui/builtinPreferenceViews/pyfaGeneralPreferences.py
+++ b/gui/builtinPreferenceViews/pyfaGeneralPreferences.py
@@ -78,6 +78,10 @@ class PFGeneralPref(PreferenceView):
                                           wx.DefaultPosition, wx.DefaultSize, 0)
         mainSizer.Add(self.cbOpenFitInNew, 0, wx.ALL | wx.EXPAND, 5)
 
+        self.cbShowShipBrowserTooltip = wx.CheckBox(panel, wx.ID_ANY, u"Show ship browser tooltip",
+                                          wx.DefaultPosition, wx.DefaultSize, 0)
+        mainSizer.Add(self.cbShowShipBrowserTooltip, 0, wx.ALL | wx.EXPAND, 5)
+
         priceSizer = wx.BoxSizer(wx.HORIZONTAL)
 
         self.stDefaultSystem = wx.StaticText(panel, wx.ID_ANY, u"Default Market Prices:", wx.DefaultPosition, wx.DefaultSize, 0)
@@ -104,6 +108,7 @@ class PFGeneralPref(PreferenceView):
         self.cbExportCharges.SetValue(self.sFit.serviceFittingOptions["exportCharges"])
         self.cbOpenFitInNew.SetValue(self.sFit.serviceFittingOptions["openFitInNew"])
         self.chPriceSystem.SetStringSelection(self.sFit.serviceFittingOptions["priceSystem"])
+        self.cbShowShipBrowserTooltip.SetValue(self.sFit.serviceFittingOptions["showShipBrowserTooltip"])
 
         self.cbGlobalChar.Bind(wx.EVT_CHECKBOX, self.OnCBGlobalCharStateChange)
         self.cbGlobalDmgPattern.Bind(wx.EVT_CHECKBOX, self.OnCBGlobalDmgPatternStateChange)
@@ -118,6 +123,7 @@ class PFGeneralPref(PreferenceView):
         self.cbExportCharges.Bind(wx.EVT_CHECKBOX, self.onCBExportCharges)
         self.cbOpenFitInNew.Bind(wx.EVT_CHECKBOX, self.onCBOpenFitInNew)
         self.chPriceSystem.Bind(wx.EVT_CHOICE, self.onPriceSelection)
+        self.cbShowShipBrowserTooltip.Bind(wx.EVT_CHECKBOX, self.onCBShowShipBrowserTooltip)
 
         self.cbRackLabels.Enable(self.sFit.serviceFittingOptions["rackSlots"] or False)
 
@@ -179,6 +185,9 @@ class PFGeneralPref(PreferenceView):
     def onCBOpenFitInNew(self, event):
         self.sFit.serviceFittingOptions["openFitInNew"] = self.cbOpenFitInNew.GetValue()
 
+    def onCBShowShipBrowserTooltip(self, event):
+        self.sFit.serviceFittingOptions["showShipBrowserTooltip"] = self.cbShowShipBrowserTooltip.GetValue()
+
     def getImage(self):
         return BitmapLoader.getBitmap("prefs_settings", "gui")
 
diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py
index a0b777b79..466c768cb 100644
--- a/gui/shipBrowser.py
+++ b/gui/shipBrowser.py
@@ -1156,7 +1156,9 @@ class ShipItem(SFItem.SFBrowserItem):
 
         self.raceDropShadowBmp = drawUtils.CreateDropShadowBitmap(self.raceBmp, 0.2)
 
-        self.SetToolTip(wx.ToolTip(self.shipTrait))
+        sFit = Fit.getInstance()
+        if self.shipTrait and sFit.serviceFittingOptions["showShipBrowserTooltip"]:
+            self.SetToolTip(wx.ToolTip(self.shipTrait))
 
         self.shipBrowser = self.Parent.Parent
 
@@ -1492,7 +1494,9 @@ class FitItem(SFItem.SFBrowserItem):
         self.dragTLFBmp = None
 
         self.bkBitmap = None
-        if self.shipTrait != "":  # show no tooltip if no trait available
+        sFit = Fit.getInstance()
+        # show no tooltip if no trait available or setting is disabled
+        if self.shipTrait and sFit.serviceFittingOptions["showShipBrowserTooltip"]:
             self.SetToolTip(wx.ToolTip(u'{}\n{}\n{}'.format(self.shipName, u'─' * 20, self.shipTrait)))
         self.padding = 4
         self.editWidth = 150
diff --git a/service/fit.py b/service/fit.py
index ea072b829..727ba913f 100644
--- a/service/fit.py
+++ b/service/fit.py
@@ -73,6 +73,7 @@ class Fit(object):
             "openFitInNew": False,
             "priceSystem": "Jita",
             "useStaticAdaptiveArmorHardener": False,
+            "showShipBrowserTooltip": True,
         }
 
         self.serviceFittingOptions = SettingsProvider.getInstance().getSettings(