diff --git a/rhodecode/templates/admin/gists/gist_index.mako b/rhodecode/templates/admin/gists/gist_index.mako
--- a/rhodecode/templates/admin/gists/gist_index.mako
+++ b/rhodecode/templates/admin/gists/gist_index.mako
@@ -27,13 +27,13 @@
 
     <ul class="button-links">
       % if c.is_super_admin:
-        <li class="btn ${h.is_active('all', c.active)}"><a href="${h.route_path('gists_show', _query={'all': 1})}">${_('All gists')}</a></li>
+        <li><a class="btn ${h.is_active('all', c.active)}" href="${h.route_path('gists_show', _query={'all': 1})}">${_('All gists')}</a></li>
       %endif
-      <li class="btn ${h.is_active('public', c.active)}"><a href="${h.route_path('gists_show')}">${_('All public')}</a></li>
+      <li><a class="btn ${h.is_active('public', c.active)}" href="${h.route_path('gists_show')}">${_('All public')}</a></li>
       %if c.rhodecode_user.username != h.DEFAULT_USER:
-        <li class="btn ${h.is_active('my_all', c.active)}"><a href="${h.route_path('gists_show', _query={'public':1, 'private': 1})}">${_('My gists')}</a></li>
-        <li class="btn ${h.is_active('my_private', c.active)}"><a href="${h.route_path('gists_show', _query={'private': 1})}">${_('My private')}</a></li>
-        <li class="btn ${h.is_active('my_public', c.active)}"><a href="${h.route_path('gists_show', _query={'public': 1})}">${_('My public')}</a></li>
+        <li><a class="btn ${h.is_active('my_all', c.active)}" href="${h.route_path('gists_show', _query={'public':1, 'private': 1})}">${_('My gists')}</a></li>
+        <li><a class="btn ${h.is_active('my_private', c.active)}" href="${h.route_path('gists_show', _query={'private': 1})}">${_('My private')}</a></li>
+        <li><a class="btn ${h.is_active('my_public', c.active)}" href="${h.route_path('gists_show', _query={'public': 1})}">${_('My public')}</a></li>
       %endif
     </ul>
 
diff --git a/rhodecode/templates/admin/gists/gist_new.mako b/rhodecode/templates/admin/gists/gist_new.mako
--- a/rhodecode/templates/admin/gists/gist_new.mako
+++ b/rhodecode/templates/admin/gists/gist_new.mako
@@ -65,11 +65,11 @@
                     <fieldset>
                         <div class="gist-type-fields-wrapper">
 
-                        <input type="radio" id="private_gist" checked="" name="gist_type" value="private">
+                        <input type="radio" id="private_gist" checked="" name="gist_type" value="private" onchange="setGistId('private')">
                         <label for="private_gist">${_('Private Gist')}</label>
                         <span class="tooltip label" title="${_('Private Gists are not listed and only accessible through their secret url.')}">${_('Private Gist')}</span>
 
-                        <input type="radio" id="public_gist" name="gist_type" value="public">
+                        <input type="radio" id="public_gist" name="gist_type" value="public" onchange="setGistId('public')">
                         <label for="public_gist">${_('Public Gist')}</label>
                         <span class="tooltip label" title="${_('Public Gists are accessible to anyone and listed in Gists page.')}">${_('Public Gist')}</span>
                         </div>
@@ -99,5 +99,14 @@
     setCodeMirrorModeFromInput(
         modes_select, filename_selector, myCodeMirror, null);
 
+    setGistId = function(gistType) {
+        if (gistType === 'private') {
+            $('#gistid').removeAttr('disabled');
+        }
+        else {
+            $('#gistid').val('');
+            $('#gistid').attr('disabled', 'disabled')
+        }
+    }
 </script>
 </%def>