diff --git a/LightlessSync/UI/CompactUI.cs b/LightlessSync/UI/CompactUI.cs
index 5a7439a..b93b393 100644
--- a/LightlessSync/UI/CompactUI.cs
+++ b/LightlessSync/UI/CompactUI.cs
@@ -651,7 +651,7 @@ public class CompactUi : WindowMediatorSubscriberBase
         bool FilterNotTaggedUsers(KeyValuePair<Pair, List<GroupFullInfoDto>> u)
             => u.Key.IsDirectlyPaired && !u.Key.IsOneSidedPair && !_tagHandler.HasAnyPairTag(u.Key.UserData.UID);
         bool FilterNotTaggedSyncshells(GroupFullInfoDto group)
-            => (!_tagHandler.HasAnySyncshellTag(group.GID) && !_configService.Current.ShowGroupedSyncshellsInAll) || true;
+            => !_tagHandler.HasAnySyncshellTag(group.GID) || _configService.Current.ShowGroupedSyncshellsInAll;
         bool FilterOfflineUsers(KeyValuePair<Pair, List<GroupFullInfoDto>> u)
             => ((u.Key.IsDirectlyPaired && _configService.Current.ShowSyncshellOfflineUsersSeparately)
                 || !_configService.Current.ShowSyncshellOfflineUsersSeparately)
@@ -709,11 +709,7 @@ public class CompactUi : WindowMediatorSubscriberBase
                     syncshellFolderTags.Add(_drawEntityFactory.CreateDrawGroupFolder($"tag_{group.GID}", group, filteredGroupPairs, allGroupPairs));
                 }
             }
-
-            if (syncshellFolderTags.Count > 0)
-            {
-                drawFolders.Add(new DrawGroupedGroupFolder(syncshellFolderTags, _tagHandler, _uiSharedService, _selectSyncshellForTagUi, _renameSyncshellTagUi, syncshelltag));
-            }
+            drawFolders.Add(new DrawGroupedGroupFolder(syncshellFolderTags, _tagHandler, _uiSharedService, _selectSyncshellForTagUi, _renameSyncshellTagUi, syncshelltag));
         }
 
         var allOnlineNotTaggedPairs = ImmutablePairList(allPairs
diff --git a/LightlessSync/UI/Components/DrawGroupedGroupFolder.cs b/LightlessSync/UI/Components/DrawGroupedGroupFolder.cs
index d1876ac..2aa3d5c 100644
--- a/LightlessSync/UI/Components/DrawGroupedGroupFolder.cs
+++ b/LightlessSync/UI/Components/DrawGroupedGroupFolder.cs
@@ -34,8 +34,6 @@ public class DrawGroupedGroupFolder : IDrawFolder
 
     public void Draw()
     {
-        if (!_groups.Any()) return;
-
         string _id = "__folder_syncshells";
         if (_tag != "")
         {
diff --git a/LightlessSync/UI/SettingsUi.cs b/LightlessSync/UI/SettingsUi.cs
index a973c34..fdbe821 100644
--- a/LightlessSync/UI/SettingsUi.cs
+++ b/LightlessSync/UI/SettingsUi.cs
@@ -1152,12 +1152,12 @@ public class SettingsUi : WindowMediatorSubscriberBase
             }
             _uiShared.DrawHelpText("This will group up all Syncshells in a special 'All Syncshells' folder in the main UI.");
 
-            //if (ImGui.Checkbox("Show grouped syncshells in main screen/all syncshells", ref groupedSyncshells))
-            //{
-            //    _configService.Current.ShowGroupedSyncshellsInAll = groupedSyncshells;
-            //    _configService.Save();
-            //    Mediator.Publish(new RefreshUiMessage());
-            //}
+            if (ImGui.Checkbox("Show grouped syncshells in main screen/all syncshells", ref groupedSyncshells))
+            {
+                _configService.Current.ShowGroupedSyncshellsInAll = groupedSyncshells;
+                _configService.Save();
+                Mediator.Publish(new RefreshUiMessage());
+            }
             _uiShared.DrawHelpText("This will show grouped syncshells in main screen or group 'All Syncshells'.");
 
             if (ImGui.Checkbox("Show player name for visible players", ref showNameInsteadOfNotes))