diff --git a/src/FolderManager/FolderItem.vala b/src/FolderManager/FolderItem.vala
index 3f55c77c26..1fb9c20699 100644
--- a/src/FolderManager/FolderItem.vala
+++ b/src/FolderManager/FolderItem.vala
@@ -48,6 +48,7 @@ namespace Scratch.FolderManager {
 
             dummy = new Code.Widgets.SourceList.Item ("");
             // Must add dummy on unexpanded folders else expander will not show
+            dummy.selectable = false;
             ((Code.Widgets.SourceList.ExpandableItem)this).add (dummy);
             has_dummy = true;
 
diff --git a/src/Widgets/SourceList/SourceList.vala b/src/Widgets/SourceList/SourceList.vala
index 06fdcc783b..431182e236 100644
--- a/src/Widgets/SourceList/SourceList.vala
+++ b/src/Widgets/SourceList/SourceList.vala
@@ -1891,8 +1891,10 @@ public class SourceList : Gtk.ScrolledWindow {
                 set_tooltip_row (tooltip, path);
 
                 if (item.tooltip == null) {
-                    tooltip.set_markup (item.name);
-                    should_show = true;
+                    if (item.name != "") {
+                        tooltip.set_markup (item.name);
+                        should_show = true;
+                    }
                 } else if (item.tooltip != "") {
                     tooltip.set_markup (item.tooltip);
                     should_show = true;
@@ -2019,8 +2021,9 @@ public class SourceList : Gtk.ScrolledWindow {
 
             if (item != null) {
                 // Main categories ARE NOT selectable, so check for that
-                if (!data_model.is_category (item, null, path))
+                if (!data_model.is_category (item, null, path)) {
                     selectable = item.selectable;
+                }
             }
 
             return selectable;