diff --git a/app/views/issues/index.rhtml b/app/views/issues/index.rhtml
index 3a5c41c5..890ccabb 100644
--- a/app/views/issues/index.rhtml
+++ b/app/views/issues/index.rhtml
@@ -1,13 +1,18 @@
+<div class="title-bar">
+
+<h2><%= @query.new_record? ? l(:label_issue_plural) : h(@query.name) %></h2>
+<% html_title(@query.new_record? ? l(:label_issue_plural) : @query.name) %>
+
+<div class="title-bar-extras">
+
 <div class="contextual">
 <% if !@query.new_record? && @query.editable_by?(User.current) %>
 	<%= link_to l(:button_edit), {:controller => 'queries', :action => 'edit', :id => @query}, :class => 'icon icon-edit' %>
 	<%= link_to l(:button_delete), {:controller => 'queries', :action => 'destroy', :id => @query}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
 <% end %>
+<%= render :partial => 'queries/new_issue_button' %>
 </div>
 
-<h2><%= @query.new_record? ? l(:label_issue_plural) : h(@query.name) %></h2>
-<% html_title(@query.new_record? ? l(:label_issue_plural) : @query.name) %>
-
 <% form_tag({ :controller => 'queries', :action => 'new' }, :id => 'query_form') do %>
     <%= hidden_field_tag('project_id', @project.to_param) if @project %>
 		<div id="query_form_content" class="hide-when-print">
@@ -55,6 +60,9 @@
     </p>
 <% end %>
 
+</div><!-- .title-bar-extras -->
+</div><!-- .title-bar -->
+
 <%= error_messages_for 'query' %>
 <% if @query.valid? %>
 <% if @issues.empty? %>
diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index 054c9181..3c664b3e 100644
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -1508,7 +1508,6 @@ fieldset#filters div.add-filter {
 }
 .title-bar .contextual {
 	border-left:1px solid #237084;
-	height:100%;
 	padding:0 140px 0 12px;
 	position:absolute;
 	right:10px;