diff --git a/app/assets/stylesheets/selects.scss b/app/assets/stylesheets/selects.scss
index 8a695d8..7259c7d 100644
--- a/app/assets/stylesheets/selects.scss
+++ b/app/assets/stylesheets/selects.scss
@@ -51,3 +51,7 @@
 .chosen-container .chosen-drop .chosen-search input {
   background-position-y: -24px !important;
 }
+
+.chosen-compact {
+  max-width: 170px !important;
+}
diff --git a/app/views/projects/issues/_issue_context.html.haml b/app/views/projects/issues/_issue_context.html.haml
index 6882787..1e6c04d 100644
--- a/app/views/projects/issues/_issue_context.html.haml
+++ b/app/views/projects/issues/_issue_context.html.haml
@@ -11,14 +11,16 @@
   - elsif issue.assignee
     = link_to_member(@project, @issue.assignee)
 
-  - if issue.milestone
-    - milestone = issue.milestone
-    %cite.cgray and attached to milestone
 
-  - if can?(current_user, :modify_issue, @issue)
-    = f.select(:milestone_id, milestone_options(@issue), { include_blank: "Select milestone (none):" }, {class: 'chosen'})
+  .pull-right
+    - if issue.milestone
+      - milestone = issue.milestone
+      %cite.cgray Attached to milestone
+
+    - if can?(current_user, :modify_issue, @issue)
+      = f.select(:milestone_id, milestone_options(@issue), { include_blank: "Select milestone (none):" }, {class: 'chosen chosen-compact'})
 
-    = hidden_field_tag :issue_context
-    = f.submit class: 'btn'
-  - elsif issue.milestone
-    = link_to issue.milestone.title, project_milestone_path
+      = hidden_field_tag :issue_context
+      = f.submit class: 'btn'
+    - elsif issue.milestone
+      = link_to issue.milestone.title, project_milestone_path
diff --git a/app/views/projects/merge_requests/show/_mr_box.html.haml b/app/views/projects/merge_requests/show/_mr_box.html.haml
index b85a6ec..02d5d29 100644
--- a/app/views/projects/merge_requests/show/_mr_box.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_box.html.haml
@@ -17,10 +17,10 @@
         - if @merge_request.assignee
           Currently assigned to #{link_to_member(@project, @merge_request.assignee)}.
       - if @merge_request.milestone
-        - milestone = @merge_request.milestone
-        %cite.cgray Attached to milestone
-        %strong= link_to_gfm truncate(milestone.title, length: 20), project_milestone_path(milestone.project, milestone)
-        \.
+        .pull-right
+          - milestone = @merge_request.milestone
+          %cite.cgray Attached to milestone
+          %strong= link_to_gfm truncate(milestone.title, length: 20), project_milestone_path(milestone.project, milestone)
 
 
   - if @merge_request.description.present?
--
libgit2 0.21.2