diff --git a/templates/components/delete_confirmation.html b/templates/components/delete_confirmation.html
index e5e9bfc5..ac2d250b 100644
--- a/templates/components/delete_confirmation.html
+++ b/templates/components/delete_confirmation.html
@@ -17,7 +17,7 @@
           </button>
         </form>
         <div class="action-group">
-          <a v-on:click="deleteText = ''; $root.closeModal({{ modal_id }})" class="action-group__action icon-link icon-link--default">{{ "common.cancel" | translate }}</a>
+          <a v-on:click="deleteText = ''; $root.closeModal('{{ modal_id }}')" class="action-group__action icon-link icon-link--default">{{ "common.cancel" | translate }}</a>
         </div>
       </div>
     </div>
diff --git a/templates/fragments/applications/edit_environments.html b/templates/fragments/applications/edit_environments.html
index ee4643f9..4d401eef 100644
--- a/templates/fragments/applications/edit_environments.html
+++ b/templates/fragments/applications/edit_environments.html
@@ -115,10 +115,10 @@
 
           {{
             DeleteConfirmation(
-              modal_id=delete_modal_environment_id,
+              modal_id=delete_environment_modal_id,
               delete_text=('portfolios.applications.environments.delete.button' | translate),
               delete_action= url_for('applications.delete_environment', environment_id=env['id']),
-              form=form
+              form=edit_form
             )
           }}
         {% endcall %}
diff --git a/templates/portfolios/applications/settings.html b/templates/portfolios/applications/settings.html
index 79062961..b5587a24 100644
--- a/templates/portfolios/applications/settings.html
+++ b/templates/portfolios/applications/settings.html
@@ -93,7 +93,7 @@
 
       {{
         DeleteConfirmation(
-          modal_id=delete_modal_environment_id,
+          modal_id="delete_application",
           delete_text=('portfolios.applications.delete.button' | translate),
           delete_action= url_for('applications.delete', application_id=application.id),
           form=application_form