diff --git a/app/views/issues/_form.rhtml b/app/views/issues/_form.rhtml
index d91effedf..0f5e10de9 100644
--- a/app/views/issues/_form.rhtml
+++ b/app/views/issues/_form.rhtml
@@ -21,7 +21,7 @@
 <%= prompt_to_remote(l(:label_issue_category_new),
                      l(:label_issue_category_new), 'category[name]', 
                      {:controller => 'projects', :action => 'add_issue_category', :id => @project},
-                     :class => 'small') if authorize_for('projects', 'add_issue_category') %></p>
+                     :class => 'small', :tabindex => 199) if authorize_for('projects', 'add_issue_category') %></p>
 </div>
 
 <div class="splitcontentright">
diff --git a/public/javascripts/jstoolbar/jstoolbar.js b/public/javascripts/jstoolbar/jstoolbar.js
index 65f25bac1..7941bd135 100644
--- a/public/javascripts/jstoolbar/jstoolbar.js
+++ b/public/javascripts/jstoolbar/jstoolbar.js
@@ -81,6 +81,7 @@ jsButton.prototype.draw = function() {
 	
 	var button = document.createElement('button');
 	button.setAttribute('type','button');
+	button.tabIndex = 200;
 	if (this.className) button.className = this.className;
 	button.title = this.title;
 	var span = document.createElement('span');