diff --git a/RealmTasks Apple/RealmTasks macOS/TaskListViewController.swift b/RealmTasks Apple/RealmTasks macOS/TaskListViewController.swift
index c868c27..ca67e91 100644
--- a/RealmTasks Apple/RealmTasks macOS/TaskListViewController.swift	
+++ b/RealmTasks Apple/RealmTasks macOS/TaskListViewController.swift	
@@ -132,7 +132,7 @@ extension TaskListViewController {
     }
 
     override func validateToolbarItem(theItem: NSToolbarItem) -> Bool {
-        return theItem.action != #selector(newTask) || currentlyEditingCellView?.text.isEmpty == false
+        return theItem.action != #selector(newTask) || currentlyEditingCellView == nil || currentlyEditingCellView?.text.isEmpty == false
     }
 }