diff --git a/CHANGELOG b/CHANGELOG
index 7dc3b230e..7bcd62987 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,10 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o [Zenmap] Fixed a crash that would happen when you entered a search
+  term starting with a colon: "AttributeError:
+  'FilteredNetworkInventory' object has no attribute 'match_'".
+  Reported by Kris Paernell. [David Fifield]
+
 o [Ncat] Added NCAT_PROTO, NCAT_REMOTE_ADDR, NCAT_REMOTE_PORT, NCAT_LOCAL_ADDR
   and NCAT_LOCAL_PORT environment variables being set in all --*-exec child
   processes.
diff --git a/zenmap/zenmapCore/NetworkInventory.py b/zenmap/zenmapCore/NetworkInventory.py
index ea9d9d659..eac21c83e 100644
--- a/zenmap/zenmapCore/NetworkInventory.py
+++ b/zenmap/zenmapCore/NetworkInventory.py
@@ -445,7 +445,6 @@ class FilteredNetworkInventory(NetworkInventory):
         search_keywords["ofp"] = "open_filtered"
         search_keywords["closed|filtered"] = "closed_filtered"
         search_keywords["cfp"] = "closed_filtered"
-        search_keywords[""] = ""
         self.search_parser = SearchParser(self, search_keywords)
 
     # FIXME: This method doesn't do anything.  We just need to support