diff --git a/src/UI/Settings/MediaManagement/Naming/Partials/ReleaseGroupNamingPartial.hbs b/src/UI/Settings/MediaManagement/Naming/Partials/ReleaseGroupNamingPartial.hbs
index 137d9fce3..bf9ea50a4 100644
--- a/src/UI/Settings/MediaManagement/Naming/Partials/ReleaseGroupNamingPartial.hbs
+++ b/src/UI/Settings/MediaManagement/Naming/Partials/ReleaseGroupNamingPartial.hbs
@@ -1 +1,8 @@
-<li><a href="#" data-token="Release Group">Release Group</a></li>
\ No newline at end of file
+<li class="dropdown-submenu">
+    <a href="#" tabindex="-1" data-token="Release Group">Release Group</a>
+    <ul class="dropdown-menu">
+        <li><a href="#" data-token="Release Group">Release Group</a></li>
+        <li><a href="#" data-token="Release.Group">Release.Group</a></li>
+        <li><a href="#" data-token="Release_Group">Release_Group</a></li>
+    </ul>
+</li>
diff --git a/src/UI/Settings/MediaManagement/Naming/Partials/SeparatorNamingPartial.hbs b/src/UI/Settings/MediaManagement/Naming/Partials/SeparatorNamingPartial.hbs
index eb2abe61a..2b19d32b5 100644
--- a/src/UI/Settings/MediaManagement/Naming/Partials/SeparatorNamingPartial.hbs
+++ b/src/UI/Settings/MediaManagement/Naming/Partials/SeparatorNamingPartial.hbs
@@ -1,5 +1,5 @@
 <li class="dropdown-submenu">
-    <a href="#" tabindex="-1">Separator</a>
+    <a href="#" tabindex="-1" data-separator=" - ">Separator</a>
     <ul class="dropdown-menu">
         <li><a href="#" data-separator=" - ">Space-Dash-Space</a></li>
         <li><a href="#" data-separator="-">Dash</a></li>