diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb
index e9a61e2c2a6..8abe7865fed 100644
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -98,7 +98,7 @@ module MergeRequestsHelper
   end
 
   def merge_request_button_visibility(merge_request, closed)
-    return 'hidden' if merge_request.can_reopen?
+    return 'hidden' if merge_request.closed? == closed || (merge_request.merged? == closed && !merge_request.closed?) || merge_request.closed_without_fork?
   end
 
   def merge_request_version_path(project, merge_request, merge_request_diff, start_sha = nil)
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 031e95b411e..4b8daacc7e0 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -1101,7 +1101,7 @@ describe MergeRequest, models: true do
           expect(merge_request.reload.can_reopen?).to be_falsey
         end
 
-        it 'returnes false if the merge request is merged' do
+        it 'returns false if the merge request is merged' do
           merge_request.update_attributes(state: 'merged')
 
           expect(merge_request.reload.can_reopen?).to be_falsey