diff --git a/config.py b/config.py
index 1ce7b1445..7ef0b9fa8 100644
--- a/config.py
+++ b/config.py
@@ -27,6 +27,8 @@ expansionName = "YC120.3"
 expansionVersion = "1.8"
 evemonMinVersion = "4081"
 
+minItemSearchLength = 2
+
 pyfaPath = None
 savePath = None
 saveDB = None
diff --git a/gui/builtinMarketBrowser/itemView.py b/gui/builtinMarketBrowser/itemView.py
index eb0d6bb51..7a26cfed1 100644
--- a/gui/builtinMarketBrowser/itemView.py
+++ b/gui/builtinMarketBrowser/itemView.py
@@ -1,5 +1,6 @@
 import wx
 
+import config
 import gui.builtinMarketBrowser.pfSearchBox as SBox
 from gui.contextMenu import ContextMenu
 from gui.display import Display
@@ -170,10 +171,6 @@ class ItemView(Display):
         if len(realsearch) == 0:
             self.selectionMade()
             return
-        # Show nothing if query is too short
-        elif len(realsearch) < 3:
-            self.clearSearch()
-            return
 
         self.marketBrowser.searchMode = True
         self.sMkt.searchItems(search, self.populateSearch)
diff --git a/service/market.py b/service/market.py
index d38fb4704..70794f79b 100644
--- a/service/market.py
+++ b/service/market.py
@@ -114,14 +114,20 @@ class SearchWorkerThread(threading.Thread):
                 filter_ = None
 
 
-            results = eos.db.searchItems(request, where=filter_,
-                                         join=(types_Item.group, types_Group.category),
-                                         eager=("icon", "group.category", "metaGroup", "metaGroup.parent"))
-
             jargon_request = self.jargonLoader.get_jargon().apply(request)
-            jargon_results = eos.db.searchItems(jargon_request, where=filter_,
-                                         join=(types_Item.group, types_Group.category),
-                                         eager=("icon", "group.category", "metaGroup", "metaGroup.parent"))
+
+
+            results = []
+            if len(request) >= config.minItemSearchLength:
+                results = eos.db.searchItems(request, where=filter_,
+                                             join=(types_Item.group, types_Group.category),
+                                             eager=("icon", "group.category", "metaGroup", "metaGroup.parent"))
+
+            jargon_results = []
+            if len(jargon_request) >= config.minItemSearchLength:
+                jargon_results = eos.db.searchItems(jargon_request, where=filter_,
+                                             join=(types_Item.group, types_Group.category),
+                                             eager=("icon", "group.category", "metaGroup", "metaGroup.parent"))
 
             items = set()
             # Return only published items, consult with Market service this time