diff --git a/src/sunstone/public/js/plugins/groups-tab.js b/src/sunstone/public/js/plugins/groups-tab.js
index 1ec6e8485a..94448f4f67 100644
--- a/src/sunstone/public/js/plugins/groups-tab.js
+++ b/src/sunstone/public/js/plugins/groups-tab.js
@@ -1388,7 +1388,13 @@ function setupGroupQuotasDialog(){
 }
 
 function popUpGroupQuotasDialog(){
-    popUpQuotasDialog($group_quotas_dialog, 'Group', groupElements())
+    var tab = dataTable_groups.parents(".tab");
+    if (Sunstone.rightInfoVisible(tab)) {
+        $('a[href="#group_quotas_tab"]', tab).click();
+        $('#edit_quotas_button', tab).click();
+    } else {
+        popUpQuotasDialog($group_quotas_dialog, 'Group', groupElements())
+    }
 }
 
 $(document).ready(function(){
diff --git a/src/sunstone/public/js/plugins/users-tab.js b/src/sunstone/public/js/plugins/users-tab.js
index 92ead0efd3..0523780a3c 100644
--- a/src/sunstone/public/js/plugins/users-tab.js
+++ b/src/sunstone/public/js/plugins/users-tab.js
@@ -870,7 +870,13 @@ function setupUserQuotasDialog(){
 }
 
 function popUpUserQuotasDialog(){
-    popUpQuotasDialog($user_quotas_dialog, 'User', userElements());
+    var tab = dataTable_users.parents(".tab");
+    if (Sunstone.rightInfoVisible(tab)) {
+        $('a[href="#user_quotas_tab"]', tab).click();
+        $('#edit_quotas_button', tab).click();
+    } else {
+        popUpQuotasDialog($user_quotas_dialog, 'User', userElements());
+    }
 }
 
 function popUpCreateUserDialog(){