diff --git a/src/api/app/views/webui2/webui/project/_add_new_subproject_modal.html.haml b/src/api/app/views/webui2/webui/project/_add_new_subproject_modal.html.haml
deleted file mode 100644
index a81cb731115..00000000000
--- a/src/api/app/views/webui2/webui/project/_add_new_subproject_modal.html.haml
+++ /dev/null
@@ -1,8 +0,0 @@
-.modal.fade#add-new-subproject-modal{ tabindex: -1, role: 'dialog', aria: { labelledby: 'add-new-subproject-modal-label', hidden: true } }
-  .modal-dialog.modal-lg{ role: 'document' }
-    .modal-content
-      .modal-header
-        %h5.modal-title#add-new-subproject-modal-label
-          Create Subproject
-      .modal-body
-        = render partial: 'form', locals: { project: Project.new, namespace: project.name, configuration: configuration }
diff --git a/src/api/app/views/webui2/webui/project/_form.html.haml b/src/api/app/views/webui2/webui/project/_form.html.haml
index cc37938332e..5b70d5f4e1c 100644
--- a/src/api/app/views/webui2/webui/project/_form.html.haml
+++ b/src/api/app/views/webui2/webui/project/_form.html.haml
@@ -9,7 +9,7 @@
             #{namespace}:
         = form.text_field(:name, required: true, class: 'form-control')
     - else
-      = form.label(:name, 'Project Name:', class: 'form-control')
+      = form.label(:name, 'Project Name:')
       = form.text_field(:name, required: true, class: 'form-control')
   .form-group
     = form.label(:title, 'Title:')
diff --git a/src/api/app/views/webui2/webui/project/_new_project_modal.html.haml b/src/api/app/views/webui2/webui/project/_new_project_modal.html.haml
new file mode 100644
index 00000000000..9a1ba89148e
--- /dev/null
+++ b/src/api/app/views/webui2/webui/project/_new_project_modal.html.haml
@@ -0,0 +1,10 @@
+.modal.fade#new-project-modal{ tabindex: '-1', role: 'dialog', aria: { labelledby: 'new-project-modal-label', hidden: true } }
+  .modal-dialog.modal-lg{ role: 'document' }
+    .modal-content
+      .modal-header
+        %h5.modal-title#new-project-modal-label
+          = local_assigns.key?(:project) ? 'Create Subproject' : 'Create Project'
+      .modal-body
+        - options = { project: Project.new, configuration: configuration }
+        - options[:namespace] = project.name if local_assigns.key?(:project)
+        = render partial: 'form', locals: options
diff --git a/src/api/app/views/webui2/webui/project/list.html.haml b/src/api/app/views/webui2/webui/project/list.html.haml
index 7a3e4e83fac..0b413247b9f 100644
--- a/src/api/app/views/webui2/webui/project/list.html.haml
+++ b/src/api/app/views/webui2/webui/project/list.html.haml
@@ -32,9 +32,11 @@
             Include #{::Configuration.unlisted_projects_filter_description}
       - unless User.current.is_nobody?
         %li.list-inline-item
-          = link_to(new_project_path) do
+          = link_to('#', data: { toggle: 'modal', target: '#new-project-modal' }) do
             %i.fas.fa-plus-circle.text-primary
             Add New Project
+          = render partial: 'new_project_modal', locals: { configuration: @configuration }
+
     - cachekey = Digest::MD5.hexdigest(@projects.join)
     - projecturl = project_show_path('REPLACEIT')
     #project-list
diff --git a/src/api/app/views/webui2/webui/project/subprojects.html.haml b/src/api/app/views/webui2/webui/project/subprojects.html.haml
index 058cc41686e..8b346648e4b 100644
--- a/src/api/app/views/webui2/webui/project/subprojects.html.haml
+++ b/src/api/app/views/webui2/webui/project/subprojects.html.haml
@@ -16,7 +16,7 @@
           %p
             %i This project has no subprojects
         - if User.current.can_modify?(@project)
-          = link_to('#', data: { toggle: 'modal', target: '#add-new-subproject-modal' }, title: 'Add New Subproject', class: 'nav-link') do
+          = link_to('#', data: { toggle: 'modal', target: '#new-project-modal' }, class: 'nav-link') do
             %i.fas.fa-plus-circle.text-primary
             Add New Subproject
     .row.mt-3
@@ -24,7 +24,7 @@
         - if @siblings.present?
           = render partial: 'projects_table', locals: { table_title: 'Sibling Project', project: @project, projects: @siblings }
 
-= render partial: 'add_new_subproject_modal', locals: { project: @project, configuration: @configuration }
+= render partial: 'new_project_modal', locals: { project: @project, configuration: @configuration }
 
 :javascript
   initializeDataTable('.projects-table');