diff --git a/app/controllers/auto_completes_controller.rb b/app/controllers/auto_completes_controller.rb
index 1b0bffa..bb1c203 100644
--- a/app/controllers/auto_completes_controller.rb
+++ b/app/controllers/auto_completes_controller.rb
@@ -22,10 +22,12 @@ class AutoCompletesController < ApplicationController
     @issues = []
     q = (params[:q] || params[:term]).to_s.strip
     status = params[:status].to_s.strip
+    issue = params[:issue].to_i
     if q.present?
       scope = Issue.cross_project_scope(@project, params[:scope]).visible
       scope = scope.open if status == 'o'
       scope = scope.joins(:status).where("#{IssueStatus.table_name}.is_closed = 1") if status == 'c'
+      scope = scope.where("#{Issue.table_name}.id <> ?", issue) if issue
       if q.match(/\A#?(\d+)\z/)
         @issues << scope.find_by_id($1.to_i)
       end
diff --git a/app/views/issues/_attributes.html.erb b/app/views/issues/_attributes.html.erb
index 9495dbc..bf23db2 100644
--- a/app/views/issues/_attributes.html.erb
+++ b/app/views/issues/_attributes.html.erb
@@ -47,7 +47,7 @@
 <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') %></p>
-<%= 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')}')" %>
+<%= 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 => @issue.id)}')" %>
 <% end %>
 
 <% if @issue.safe_attribute? 'start_date' %>
diff --git a/test/functional/auto_completes_controller_test.rb b/test/functional/auto_completes_controller_test.rb
index a59f950..fc57c9b 100644
--- a/test/functional/auto_completes_controller_test.rb
+++ b/test/functional/auto_completes_controller_test.rb
@@ -95,4 +95,11 @@ class AutoCompletesControllerTest < Redmine::ControllerTest
     assert_include "closed", response.body
     assert_not_include "Issue due today", response.body
   end
+
+  def test_auto_complete_with_issue_id_should_not_return_that_issue
+    get :issues, :project_id => 'ecookbook', :q => 'issue', :issue => '12'
+    assert_response :success
+    assert_include "issue", response.body
+    assert_not_include "Bug #12: Closed issue on a locked version", response.body
+  end
 end