diff --git a/lib/msf/core/exploit/http/wordpress/admin.rb b/lib/msf/core/exploit/http/wordpress/admin.rb
index 34e147261f..ad06abc9ed 100644
--- a/lib/msf/core/exploit/http/wordpress/admin.rb
+++ b/lib/msf/core/exploit/http/wordpress/admin.rb
@@ -55,25 +55,33 @@ module Msf::Exploit::Remote::HTTP::Wordpress::Admin
 
     vprint_status("Acquired a plugin edit nonce: #{nonce}")
 
-    editor_uri = normalize_uri(
-      wordpress_url_backend,
-      "plugin-editor.php?file=#{file}" # Can't use vars_get for this
-    )
-
     # https://github.com/WordPress/WordPress/blob/master/wp-admin/plugin-editor.php
     res = send_request_cgi(
       'method'       => 'POST',
-      'uri'          => editor_uri,
+      'uri'          => wordpress_url_admin_plugin_editor,
       'cookie'       => cookie,
       'vars_post'    => {
+        'action'     => 'update',
         '_wpnonce'   => nonce,
         'file'       => file,
-        'action'     => 'update',
         'newcontent' => contents
       }
     )
 
-    unless res && res.redirect? && res.redirection.to_s.include?(editor_uri)
+    unless res && res.redirect?
+      vprint_error("Server responded with code #{res.code}") if res
+      vprint_error("Failed to edit plugin file #{file}")
+      return false
+    end
+
+    # NOTE: send_request_cgi! doesn't change the method
+    res = send_request_cgi(
+      'method' => 'GET',
+      'uri'    => res.redirection.to_s,
+      'cookie' => cookie
+    )
+
+    unless res && res.code == 200 && res.body.include?('edited successfully')
       vprint_error("Server responded with code #{res.code}") if res
       vprint_error("Failed to edit plugin file #{file}")
       return false
diff --git a/lib/msf/core/exploit/http/wordpress/uris.rb b/lib/msf/core/exploit/http/wordpress/uris.rb
index c18511a113..35c0145763 100644
--- a/lib/msf/core/exploit/http/wordpress/uris.rb
+++ b/lib/msf/core/exploit/http/wordpress/uris.rb
@@ -94,6 +94,13 @@ module Msf::Exploit::Remote::HTTP::Wordpress::URIs
     normalize_uri(wordpress_url_backend, 'update.php')
   end
 
+  # Returns the Wordpress Admin Plugin Editor URL
+  #
+  # @return [String] Wordpress Admin Plugin Editor URL
+  def wordpress_url_admin_plugin_editor
+    normalize_uri(wordpress_url_backend, 'plugin-editor.php')
+  end
+
   # Returns the Wordpress wp-content dir URL
   #
   # @return [String] Wordpress wp-content dir URL