diff --git a/ChangeLog b/ChangeLog
index 4580beedaf..a8f2eacfb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog
 + Patch #3497179 Contest-5: Add user: Allow create DB w/same name + grant u_%
 + Patch #3498201 Contest-6: Export all privileges
 + Patch #3502814 for rfe #3187077 Change password buttons should match
++ rfe #3488640 Expand table-group in non-light navigation frame if only one
 
 3.5.0.0 (not yet released)
 + rfe #2021981 [interface] Add support for mass prefix change.
diff --git a/js/navigation.js b/js/navigation.js
index 21e05b8e21..a886d0cf1c 100644
--- a/js/navigation.js
+++ b/js/navigation.js
@@ -34,6 +34,12 @@ function toggle(id, only_open)
             img.src = newimg.attr('src');
             img.alt = '-';
         }
+        // if only one sub-list, open as well
+        var submenus = $(el).find("> li > ul:hidden");
+        var sublinks = $(el).find("> li > a.item, > li > a.tableicon");
+        if (submenus.length == 1 && sublinks.length == 0) {
+            toggle(submenus.prop("id").split("subel").join(""), true);
+        }
     } else {
         el.style.display = 'none';
         if (img) {