diff --git a/library/ZendAfi/View/Helper/Admin/RenderForm.php b/library/ZendAfi/View/Helper/Admin/RenderForm.php
index e8a4af29f4d8f03508915e23a3ddd124e153defc..131d3ebaed93793435ea4f6fbc14c261d651ada7 100644
--- a/library/ZendAfi/View/Helper/Admin/RenderForm.php
+++ b/library/ZendAfi/View/Helper/Admin/RenderForm.php
@@ -71,9 +71,12 @@ class ZendAfi_View_Helper_Admin_RenderForm extends ZendAfi_View_Helper_RenderFor
 
 
   protected function _renderDefaultButtons($form, $buttons = []) {
-    if ($this->view->isPopup())
-      $buttons = array_merge([$this->view->Button_Continue()],
+    if ($this->view->isPopup()) {
+      $submit = array_shift($buttons);
+      $buttons = array_merge([$submit],
+                             [$this->view->Button_Continue()],
                              $buttons);
+    }
 
     return $this->_tag('div',
                        implode($buttons),