hopefully finally fix #946

app/views/layouts/_header.html.haml

@@ -34,6 +34,7 @@
           = @unread_message_count
 
     %ul#user_menu
+      %li
         .right
           ▼
         .avatar

public/javascripts/view.js

@@ -223,18 +223,16 @@ var View = {
 
   userMenu: {
     click: function(evt) {
-      if(!$(View.userMenu.selector).hasClass("active")) {
+      $(this).parent().toggleClass("active");
       evt.preventDefault();
-      }
-      $(this).toggleClass("active");
     },
     removeFocus: function(evt) {
       var $target = $(evt.target);
-      if(!$target.closest("#user_menu").length) {
+      if(!$target.closest("#user_menu").length || ($target.attr('href') != undefined && $target.attr('href') != '#')) {
-        $(View.userMenu.selector).removeClass("active");
+        $(View.userMenu.selector).parent().removeClass("active");
       }
     },
-    selector: "#user_menu"
+    selector: "#user_menu li:first-child"
   },
 
   webFingerForm: {

public/stylesheets/sass/application.sass

@@ -178,16 +178,6 @@ header
     :top 5px
     :right 0
 
-    a
-      :padding
-        :right 15px
-      :color #CCC
-      &:hover
-        :text
-          :decoration none
-    .right
-      :right 5px
-
     &:hover
       :background
         :color #222
@@ -204,6 +194,22 @@ header
             :color $blue
           :color #fff
 
+      &:first-child
+        :display inline
+        a
+          :height auto
+          :display inline
+          :padding
+            :right 15px
+          :color #CCC
+          &:hover
+            :background
+              :color #222
+            :text
+              :decoration none
+        .right
+          :right 5px
+
     &.active
       @include box-shadow(0,1px,2px,#333)