diff --git a/omeroweb/webclient/templates/webclient/base/includes/group_user_content.html b/omeroweb/webclient/templates/webclient/base/includes/group_user_content.html
index 45dfff790e..37ba50f92a 100644
--- a/omeroweb/webclient/templates/webclient/base/includes/group_user_content.html
+++ b/omeroweb/webclient/templates/webclient/base/includes/group_user_content.html
@@ -28,7 +28,11 @@
 
 {% for grp in myGroups %}
     <li {% if grp.id == eContext.context.groupId %}class="current_group"{% endif %}>
-        <a href="#" data-gid="{{ grp.id }}">
+        {% if grp.id == ome.active_group %}
+            <a href="#" data-gid="{{ grp.id }}">
+        {% else %}
+            <a href="{% url 'change_active_group' %}?active_group={{grp.id}}" data-gid="{{ grp.id }}">
+        {% endif %}
             <img
             {% if grp.getDetails.getPermissions.isGroupWrite %} src="{% static 'webclient/image/group_green16.png' %}"
             {% else %}
@@ -50,7 +54,7 @@
 
     {% for grp in groups %}
         <li {% if grp.id == eContext.context.groupId %}class="current_group"{% endif %}>
-            <a href="#" data-gid="{{ grp.id }}">
+            <a href="{% url 'change_active_group' %}?active_group={{grp.id}}&url={{ current_url }}?experimenter=-1" data-gid="{{ grp.id }}">
                 <img
                 {% if grp.getDetails.getPermissions.isGroupWrite %} src="{% static 'webclient/image/group_green16.png' %}"
                 {% else %}
diff --git a/omeroweb/webclient/templates/webclient/base/includes/group_user_dropdown2.html b/omeroweb/webclient/templates/webclient/base/includes/group_user_dropdown2.html
index 7ed28f2424..32bce7a600 100644
--- a/omeroweb/webclient/templates/webclient/base/includes/group_user_dropdown2.html
+++ b/omeroweb/webclient/templates/webclient/base/includes/group_user_dropdown2.html
@@ -53,11 +53,9 @@
 
                         // When hover or click on a Group, show Users...
                         $( "#groupList" ).on( "mouseenter click", "li a", function(event) {
-                            event.preventDefault();
                             var gid = $(this).attr("data-gid");
                             $usersList.hide();
                             $("#groupMembers-" + gid).show();
-                            return false;
                         });
                     });
                 }