diff --git a/src/SymbolPane/C/CtagsSymbolOutline.vala b/src/SymbolPane/C/CtagsSymbolOutline.vala
index bcaf86e00..97c06f0d9 100644
--- a/src/SymbolPane/C/CtagsSymbolOutline.vala
+++ b/src/SymbolPane/C/CtagsSymbolOutline.vala
@@ -42,7 +42,11 @@ public class Scratch.Services.CtagsSymbolOutline : Scratch.Services.SymbolOutlin
     }
     construct {
         store.item_selected.connect ((selected) => {
+            if (selected == null) {
+                return;
+            }
             doc.goto (((CtagsSymbol)selected).line);
+            store.selected = null;
         });
     }
 
diff --git a/src/SymbolPane/Vala/ValaSymbolOutline.vala b/src/SymbolPane/Vala/ValaSymbolOutline.vala
index f33520a50..1131d4317 100644
--- a/src/SymbolPane/Vala/ValaSymbolOutline.vala
+++ b/src/SymbolPane/Vala/ValaSymbolOutline.vala
@@ -48,7 +48,12 @@ public class Scratch.Services.ValaSymbolOutline : Scratch.Services.SymbolOutline
         resolver = new Code.Plugins.ValaSymbolResolver ();
 
         store.item_selected.connect ((selected) => {
+            if (selected == null) {
+                return;
+            }
+
             doc.goto (((ValaSymbolItem)selected).symbol.source_reference.begin.line);
+            store.selected = null;
         });
 
         doc.doc_closed.connect (doc_closed);