diff --git a/lib/bookmarks-view.coffee b/lib/bookmarks-view.coffee
index dac6487..71dcf7a 100644
--- a/lib/bookmarks-view.coffee
+++ b/lib/bookmarks-view.coffee
@@ -48,6 +48,7 @@ class BookmarksView extends SelectListView
     bookmarks = []
     for editorBookmarks in @editorsBookmarks
       editor = editorBookmarks.editor
+      continue if editor not in atom.workspace.getTextEditors()
       for marker in editorBookmarks.markerLayer.getMarkers()
         bookmark = {marker, editor}
         bookmark.filterText = @getFilterText(bookmark)
diff --git a/lib/bookmarks.coffee b/lib/bookmarks.coffee
index 20e359b..3826ce9 100644
--- a/lib/bookmarks.coffee
+++ b/lib/bookmarks.coffee
@@ -41,6 +41,9 @@ class Bookmarks
       else
         @createBookmarkMarker(range)
 
+    if atom.workspace.getActivePane().getPendingItem() is @editor
+      atom.workspace.getActivePane().clearPendingItem()
+
   clearBookmarks: =>
     bookmark.destroy() for bookmark in @markerLayer.getMarkers()