diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php
index 440dd0e70..923e165d9 100755
--- a/e107_handlers/admin_ui.php
+++ b/e107_handlers/admin_ui.php
@@ -1676,6 +1676,11 @@ class e_admin_dispatcher
 					$var[$parentKey]['sub'][$subKey] = $processedItem;
 				}
 
+				if(!empty($processedItem['badge']) && strpos($processedItem['badge']['link_class'], 'has-badge') === false)
+				{
+					$var[$parentKey]['link_class'] .= ' has-badge';
+				}
+
 			}
 			else
 			{
@@ -1827,6 +1832,7 @@ class e_admin_dispatcher
 
 		return $var;
 	}
+
 	/**
 	 * @param $val
 	 * @param $key
diff --git a/e107_tests/tests/unit/e_themeTest.php b/e107_tests/tests/unit/e_themeTest.php
index 55fc5b25b..33a43340c 100644
--- a/e107_tests/tests/unit/e_themeTest.php
+++ b/e107_tests/tests/unit/e_themeTest.php
@@ -181,6 +181,15 @@ class e_themeTest extends \Codeception\Test\Unit
 							'description' => 'A high-contrast dark skin',
 							'thumbnail'   => 'images/admin_modern-dark.webp',
 						),
+					'css/modern-dark-2.css' => [
+				        'name' => 'css/modern-dark-2.css',
+				        'info' => 'Modern Dark 2',
+				        'nonadmin' => false,
+				        'default' => false,
+				        'exclude' => 'bootstrap',
+				        'description' => 'A high-contrast dark skin with dynamic sidebar',
+				        'thumbnail' => 'images/admin_modern-dark-2.webp',
+				        ],
 					'css/bootstrap-dark.min.css'                                                   =>
 						array(
 							'name'        => 'css/bootstrap-dark.min.css',