diff --git a/media/css/seahub.css b/media/css/seahub.css
index 5653046487..d0aa4b2d3c 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -1749,7 +1749,7 @@ button.sf-dropdown-toggle:focus {
 }
 .select2-container--default .select2-search--inline .select2-search__field {
     padding:0 5px;
-    box-sizing:content-box;
+    min-width: 2em; /* make sure there is enough space */
 }
 .select2-results__option .avatar {
     margin-right:10px;
diff --git a/static/scripts/app/views/share.js b/static/scripts/app/views/share.js
index 77aa69235e..e6b77a31a5 100644
--- a/static/scripts/app/views/share.js
+++ b/static/scripts/app/views/share.js
@@ -149,6 +149,16 @@ define([
         },
 
         clickGroupShareTab: function() {
+            if (!this.show_group_selector || this.group_tab_clicked) {
+                return;
+            }
+
+            this.group_tab_clicked = true;
+
+            var $loadingTip = this.$('.loading-tip').show();
+            var $panel = this.$('#dir-group-share');
+            var $table = $('table', $panel);
+
             var $add_item = $('#add-dir-group-share-item');
             var prepareGroupsSelector = function(groups) {
                 var group_list = [];
@@ -158,6 +168,9 @@ define([
                         text: groups[i].name
                     });
                 }
+
+                $loadingTip.hide();
+                $table.show();
                 $('[name="groups"]', $add_item).select2({
                     language: Common.i18nForSelect2(),
                     width: '100%',
@@ -802,6 +815,8 @@ define([
                 };
             }
 
+            this.show_group_selector = false;
+
             $.ajax({
                 url: url,
                 data: data,
@@ -818,7 +833,8 @@ define([
                         });
                         $add_item.after(new_item.el);
                     });
-                    $table.removeClass('hide');
+
+                    _this.show_group_selector = true;
                 },
                 error: function(xhr, textStatus, errorThrown) {
                     var err_msg = Common.prepareAjaxErrorMsg(xhr);