diff --git a/src/api/app/views/webui2/webui/project/_create_package_form.html.haml b/src/api/app/views/webui2/webui/project/_create_package_form.html.haml
index f7eb92f0544..82152741ea9 100644
--- a/src/api/app/views/webui2/webui/project/_create_package_form.html.haml
+++ b/src/api/app/views/webui2/webui/project/_create_package_form.html.haml
@@ -16,5 +16,8 @@
   .form-group.custom-control.custom-checkbox
     = check_box_tag :disable_publishing, 1, false, class: 'custom-control-input', type: 'checkbox'
     %label.custom-control-label{ for: 'disable_publishing' } Disable build results publishing
-  .modal-footer
-    = render partial: 'webui2/shared/dialog_action_buttons', locals: { submit_tag_text: 'Create' }
+  - if defined?(modal)
+    .modal-footer
+      = render partial: 'webui2/shared/dialog_action_buttons', locals: { submit_tag_text: 'Create' }
+  - else
+    = submit_tag('Create', class: 'btn btn-primary px-4')
diff --git a/src/api/app/views/webui2/webui/project/_create_package_modal.html.haml b/src/api/app/views/webui2/webui/project/_create_package_modal.html.haml
index f57b3acf75e..b5c2bc28399 100644
--- a/src/api/app/views/webui2/webui/project/_create_package_modal.html.haml
+++ b/src/api/app/views/webui2/webui/project/_create_package_modal.html.haml
@@ -5,4 +5,4 @@
         %h5.modal-title#new-package-modal-label
           Create Package for #{project.name}
       .modal-body
-        = render partial: 'create_package_form', locals: { project: project }
+        = render partial: 'create_package_form', locals: { project: project, modal: true }