2 files changed, 14 insertions, 4 deletions
diff --git a/extensions/BugModal/web/bug_modal.css b/extensions/BugModal/web/bug_modal.css
index e69bcaa2a..afa4719c4 100644
--- a/extensions/BugModal/web/bug_modal.css
+++ b/extensions/BugModal/web/bug_modal.css
@@ -206,6 +206,15 @@ select[multiple], .text_input, .yui-ac-input, input {
     width: 170px;
 }
 
+.field-button {
+    float: right;
+    margin-left: 8px;
+}
+
+.field-edit-container {
+    overflow-y: hidden;
+}
+
 /* field types */
 
 input[type="number"] {
diff --git a/extensions/BugModal/web/bug_modal.js b/extensions/BugModal/web/bug_modal.js
index 4c4d83ad8..a9ff51452 100644
--- a/extensions/BugModal/web/bug_modal.js
+++ b/extensions/BugModal/web/bug_modal.js
@@ -544,12 +544,13 @@ $(function() {
         });
 
     // take button
-    $('#take-btn')
+    $('.take-btn')
         .click(function(event) {
             event.preventDefault();
-            $('#field-assigned_to.edit-hide').hide();
-            $('#field-assigned_to.edit-show').show();
-            $('#assigned_to').val(BUGZILLA.user.login).focus().select();
+            var field = $(this).data('field');
+            $('#field-' + field + '.edit-hide').hide();
+            $('#field-' + field + '.edit-show').show();
+            $('#' + field).val(BUGZILLA.user.login).focus().select();
             $('#top-save-btn').show();
         });