diff --git a/controllers/admin/AdminStatusesController.php b/controllers/admin/AdminStatusesController.php
index 53b4d4d7f..6b7e54c55 100644
--- a/controllers/admin/AdminStatusesController.php
+++ b/controllers/admin/AdminStatusesController.php
@@ -56,6 +56,12 @@ class AdminStatusesControllerCore extends AdminController
         if (Tools::isSubmit('updateorder_return_state')) {
             $this->display = 'edit';
         }
+        if (Tools::isSubmit('submitAddorder_return_state')) {
+            $this->display = 'add';
+            if(Tools::getValue('id_order_return_state')) {
+                $this->display = 'edit';
+            }
+        }
 
         return parent::init();
     }
@@ -478,7 +484,10 @@ class AdminStatusesControllerCore extends AdminController
                 )
             );
             return $this->renderOrderStatusForm();
-        } elseif (Tools::isSubmit('updateorder_return_state') || Tools::isSubmit('addorder_return_state')) {
+        } elseif (Tools::isSubmit('updateorder_return_state')
+            || Tools::isSubmit('addorder_return_state')
+            || Tools::isSubmit('submitAddorder_return_state')
+        ) {
             return $this->renderOrderReturnsForm();
         } else {
             return parent::renderForm();