diff --git a/Maccy.xcodeproj/project.pbxproj b/Maccy.xcodeproj/project.pbxproj
index 0a56800c..3dddbb86 100644
--- a/Maccy.xcodeproj/project.pbxproj
+++ b/Maccy.xcodeproj/project.pbxproj
@@ -612,7 +612,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -664,7 +664,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
diff --git a/Maccy/Menu.swift b/Maccy/Menu.swift
index 4defc92a..60342c02 100644
--- a/Maccy/Menu.swift
+++ b/Maccy/Menu.swift
@@ -20,7 +20,12 @@ class Menu: NSMenu, NSMenuDelegate {
   }
 
   func menuWillOpen(_ menu: NSMenu) {
-    self.items = allItems
+    removeAllItems()
+
+    let oldAllItems = allItems
+    oldAllItems.forEach(addItem(_:))
+    allItems = oldAllItems
+
     setKeyEquivalents(items)
     highlight(highlightableItems(items).first)
   }
@@ -48,16 +53,18 @@ class Menu: NSMenu, NSMenuDelegate {
   }
 
   func updateFilter(filter: String) {
+    removeAllItems()
+
     let oldAllItems = allItems
 
     let searchItem = allItems.first
     let results = search.search(string: filter, within: searchableItems())
     let systemItems = allItems.filter({ isSystemItem(item: $0) })
 
-    items = [searchItem!]
-    items += results
-    items += [NSMenuItem.separator()]
-    items += systemItems
+    addItem(searchItem!)
+    results.forEach(addItem(_:))
+    addItem(NSMenuItem.separator())
+    systemItems.forEach(addItem(_:))
 
     allItems = oldAllItems