diff --git a/toolkit/components/places/src/nsNavHistory.cpp b/toolkit/components/places/src/nsNavHistory.cpp
index 6c69f661c7b..4558dd1f5b0 100644
--- a/toolkit/components/places/src/nsNavHistory.cpp
+++ b/toolkit/components/places/src/nsNavHistory.cpp
@@ -3172,7 +3172,6 @@ nsNavHistory::LazyTimerCallback(nsITimer* aTimer, void* aClosure)
   that->CommitLazyMessages();
 }
 
-
 // nsNavHistory::CommitLazyMessages
 
 void
@@ -4512,6 +4511,9 @@ GetSimpleBookmarksQueryFolder(const nsCOMArray<nsNavHistoryQuery>& aQueries,
   if (hasIt)
     return 0;
   query->GetHasUri(&hasIt);
+  if (hasIt)
+    return 0;
+  (void)query->GetHasSearchTerms(&hasIt);
   if (hasIt)
     return 0;
   if (aOptions->MaxResults() > 0)
@@ -4519,7 +4521,7 @@ GetSimpleBookmarksQueryFolder(const nsCOMArray<nsNavHistoryQuery>& aQueries,
 
   // Note that we don't care about the onlyBookmarked flag, if you specify a bookmark
   // folder, onlyBookmarked is inferred.
-
+  NS_ASSERTION(query->Folders()[0] > 0, "bad folder id");
   return query->Folders()[0];
 }