diff --git a/src/MainWindow.vala b/src/MainWindow.vala
index 078184b668..d9a3b9a9c5 100644
--- a/src/MainWindow.vala
+++ b/src/MainWindow.vala
@@ -604,6 +604,7 @@ namespace Scratch {
                     title = _("%s - %s").printf (doc.get_basename (), base_title);
 
                     toolbar.set_document_focus (doc);
+
                     folder_manager_view.select_path (doc.file.get_path ());
 
                     // Must follow setting focus document for editorconfig plug
diff --git a/src/Widgets/SourceList/SourceList.vala b/src/Widgets/SourceList/SourceList.vala
index 0ecff6daea..06fdcc783b 100644
--- a/src/Widgets/SourceList/SourceList.vala
+++ b/src/Widgets/SourceList/SourceList.vala
@@ -870,7 +870,11 @@ public class SourceList : Gtk.ScrolledWindow {
             return items.has_key (item);
         }
 
-        public void update_item (Item item) requires (has_item (item)) {
+        public void update_item (Item item) {
+            if (!has_item (item)) {
+                return;
+            }
+
             assert (root != null);
 
             // Emitting row_changed() for this item's row in the child model causes the filter