diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 50902dc050..8117e4fbbb 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -129,16 +129,18 @@ foreach (dbFetchRows($sql,$param) as $devtype) {
     echo('            <li><a href="devices/type=' . $devtype['type'] . '/"><i class="fa fa-angle-double-right fa-fw fa-lg"></i> ' . ucfirst($devtype['type']) . '</a></li>');
 }
 
-require_once '../includes/device-groups.inc.php';
-
-foreach( GetDeviceGroups() as $group ) {
-    echo '<li><a href="'.generate_url(array('page'=>'devices','group'=>$group['id'])).'" alt="'.$group['desc'].'"><i class="fa fa-th fa-fw fa-lg"></i> '.ucfirst($group['name']).'</a></li>';
-}
-unset($group);
-
         echo ('</ul>
              </li>');
-
+            require_once '../includes/device-groups.inc.php';
+            $devices_groups = GetDeviceGroups();
+            if (count($devices_groups) > 0 ){
+                echo '<li class="dropdown-submenu"><a href="#"><i class="fa fa-th fa-fw fa-lg"></i> Device Groups</a><ul class="dropdown-menu scrollable-menu">';
+                foreach( $devices_groups as $group ) {
+                    echo '<li><a href="'.generate_url(array('page'=>'devices','group'=>$group['id'])).'" alt="'.$group['desc'].'"><i class="fa fa-th fa-fw fa-lg"></i> '.ucfirst($group['name']).'</a></li>';
+                }
+                unset($group);
+                echo '</ul></li>';
+            }
 if ($_SESSION['userlevel'] >= '10') {
     if ($config['show_locations']) {
         echo('
@@ -529,7 +531,7 @@ if ($_SESSION['userlevel'] >= '10') {
            </ul>
            </li>
            <li role="presentation" class="divider"></li>');
-} 
+}
 
 if ($_SESSION['authenticated']) {
     echo('