diff --git a/Oqtane.Server/Repository/ThemeRepository.cs b/Oqtane.Server/Repository/ThemeRepository.cs
index 7a2de735..02e4a9c0 100644
--- a/Oqtane.Server/Repository/ThemeRepository.cs
+++ b/Oqtane.Server/Repository/ThemeRepository.cs
@@ -130,14 +130,16 @@ namespace Oqtane.Repository
                 {
                     // override user customizable property values
                     Theme.Name = (!string.IsNullOrEmpty(theme.Name)) ? theme.Name : Theme.Name;
-                    foreach (var themecontrol in Theme.Themes)
-                    {
-                        themecontrol.Name = Theme.Name + " - " + themecontrol.Name;
-                    }
                     // remove theme from list as it is already synced
                     themes.Remove(theme);
                 }
 
+                // format theme control names
+                foreach (var themecontrol in Theme.Themes)
+                {
+                    themecontrol.Name = Theme.Name + " - " + themecontrol.Name;
+                }
+
                 Theme.ThemeId = theme.ThemeId;
                 Theme.CreatedBy = theme.CreatedBy;
                 Theme.CreatedOn = theme.CreatedOn;