diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index a220077f04..700b749ae7 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -586,6 +586,10 @@ div.square {
 .splitcontentright {flex: 1; margin-left: 5px;}
 .splitcontenttop {flex: 2; flex-basis: 100%;}
 
+.splitcontent .quick-search {margin:0px; display: inline-flex; align-items: center;}
+.splitcontent .quick-search svg {margin-left: 5px; position: absolute;}
+.splitcontent .quick-search input.autocomplete {background: #fff; padding-left: 24px !important;}
+
 form {display: inline;}
 input, select, button {vertical-align: middle; margin-top: 1px; margin-bottom: 1px; height: 24px; padding: 0 7px;}
 input, select, textarea, button { color: #333; background-color: #fff; border:1px solid #ccc; border-radius:3px; box-sizing: border-box;}
diff --git a/app/views/issues/_attributes.html.erb b/app/views/issues/_attributes.html.erb
index 65637e51f7..807214b6e3 100644
--- a/app/views/issues/_attributes.html.erb
+++ b/app/views/issues/_attributes.html.erb
@@ -63,9 +63,14 @@
 
 <div class="splitcontentright">
 <% if @issue.safe_attribute? 'parent_issue_id' %>
-<p id="parent_issue"><%= f.text_field :parent_issue_id, :size => 10,
-                                      :required => @issue.required_attribute?('parent_issue_id'),
-                                      :onchange => "updateIssueFrom('#{escape_javascript update_issue_form_path(@project, @issue)}', this)" %></p>
+<p id="parent_issue">
+<%= label_tag 'issue_parent_issue_id', l(:field_parent_issue) %>
+<%= content_tag 'span', :class => 'quick-search' do %>
+<%= sprite_icon('search', :icon_only => true) %>
+<%= text_field :issue, :parent_issue_id, :size => 10,
+                       :required => @issue.required_attribute?('parent_issue_id'),
+                       :onchange => "updateIssueFrom('#{escape_javascript update_issue_form_path(@project, @issue)}', this)" %></p>
+<% end %>
 <%= javascript_tag "observeAutocompleteField('issue_parent_issue_id', '#{escape_javascript(auto_complete_issues_path(:project_id => @issue.project, :scope => Setting.cross_project_subtasks, :status => @issue.closed? ? 'c' : 'o', :issue_id => @issue.id))}')" %>
 <% end %>