diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c85d4aac4401f3d66a97712700d197c6254b4cd..8250b9b5cdbab950333df7085fb29735db6a525a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -93,7 +93,6 @@ entry.
 - Return conflict error in label API when title is taken by group label. !7014
 - Reduce the overhead to calculate number of open/closed issues and merge requests within the group or project. !7123
 - Fix builds tab visibility. !7178
-- Fix delete environment missing button. !7379
 - Fix project features default values. !7181
 
 ## 8.13.3 (2016-11-02)
diff --git a/changelogs/unreleased/24147-delete-env-button.yml b/changelogs/unreleased/24147-delete-env-button.yml
new file mode 100644
index 0000000000000000000000000000000000000000..159d9db492fbfd23eab3a5468a5affcb47e621b5
--- /dev/null
+++ b/changelogs/unreleased/24147-delete-env-button.yml
@@ -0,0 +1,4 @@
+---
+title: Adds back ability to stop all environments
+merge_request: 7379
+author:
\ No newline at end of file
diff --git a/spec/features/environments_spec.rb b/spec/features/environments_spec.rb
index 7c9584f6bf18a359aefbc7ecb663788c1a8a586a..eded771201b449f7c9f1dcd2eca8cc7d97dfa755 100644
--- a/spec/features/environments_spec.rb
+++ b/spec/features/environments_spec.rb
@@ -239,6 +239,14 @@ feature 'Environments', feature: true do
               end
             end
           end
+          
+          context 'whitout stop action'do
+            scenario 'does allow to stop environment' do
+              click_link('Stop')
+
+              expect(page).to have_content(environment.name.capitalize)
+            end
+          end
         end
       end
     end