diff --git a/MacPass/MPDocument.h b/MacPass/MPDocument.h
index 03824982..ce09967d 100644
--- a/MacPass/MPDocument.h
+++ b/MacPass/MPDocument.h
@@ -92,6 +92,8 @@ FOUNDATION_EXPORT NSString *const MPDocumentGroupKey;
 
 /*
  Search - see MPDocument+Search for further details
+ 
+ FIXME: Document is pinned to mode bases search. Wrong design!
  */
 @property (nonatomic, readonly) BOOL hasSearch;
 @property (nonatomic, copy) MPEntrySearchContext *searchContext;
diff --git a/MacPass/MPEntryViewController.m b/MacPass/MPEntryViewController.m
index ed68a863..fd0f46ed 100644
--- a/MacPass/MPEntryViewController.m
+++ b/MacPass/MPEntryViewController.m
@@ -463,6 +463,7 @@ NSString *const _MPTableSecurCellView = @"PasswordCell";
 
 - (void)_didAddItem:(NSNotification *)notification {
   MPDocument *document = notification.object;
+  // FIXME: UI should know search state not document!
   if(document.hasSearch) {
     return; // Search should not react to new Entries as it's displaying search results
   }