diff --git a/src/public/app/widgets/dialogs/confirm.ts b/src/public/app/widgets/dialogs/confirm.ts
index b29f0f848..70de19647 100644
--- a/src/public/app/widgets/dialogs/confirm.ts
+++ b/src/public/app/widgets/dialogs/confirm.ts
@@ -1,5 +1,6 @@
 import BasicWidget from "../basic_widget.js";
 import { t } from "../../services/i18n.js";
+import { Modal } from "bootstrap";
 
 const DELETE_NOTE_BUTTON_CLASS = "confirm-dialog-delete-note";
 
@@ -49,7 +50,7 @@ export interface ConfirmWithTitleOptions {
 export default class ConfirmDialog extends BasicWidget {
     private resolve: ConfirmDialogCallback | null;
 
-    private modal!: bootstrap.Modal;
+    private modal!: Modal;
     private $originallyFocused!: JQuery<HTMLElement> | null;
     private $confirmContent!: JQuery<HTMLElement>;
     private $okButton!: JQuery<HTMLElement>;
@@ -65,9 +66,7 @@ export default class ConfirmDialog extends BasicWidget {
 
     doRender() {
         this.$widget = $(TPL);
-        // TODO: Fix once we use proper ES imports.
-        //@ts-ignore
-        this.modal = bootstrap.Modal.getOrCreateInstance(this.$widget);
+        this.modal = Modal.getOrCreateInstance(this.$widget[0]);
         this.$confirmContent = this.$widget.find(".confirm-dialog-content");
         this.$okButton = this.$widget.find(".confirm-dialog-ok-button");
         this.$cancelButton = this.$widget.find(".confirm-dialog-cancel-button");
diff --git a/src/public/app/widgets/dialogs/password_not_set.ts b/src/public/app/widgets/dialogs/password_not_set.ts
index be608a4c2..c5e30712a 100644
--- a/src/public/app/widgets/dialogs/password_not_set.ts
+++ b/src/public/app/widgets/dialogs/password_not_set.ts
@@ -1,6 +1,7 @@
 import { t } from "../../services/i18n.js";
 import utils from "../../services/utils.js";
 import BasicWidget from "../basic_widget.js";
+import { Modal } from "bootstrap";
 
 const TPL = `
 <div class="password-not-set-dialog modal fade mx-auto" tabindex="-1" role="dialog">
@@ -27,8 +28,7 @@ export default class PasswordNoteSetDialog extends BasicWidget {
 
     doRender() {
         this.$widget = $(TPL);
-        //@ts-ignore fix once bootstrap is imported via JQuery.
-        this.modal = bootstrap.Modal.getOrCreateInstance(this.$widget);
+        this.modal = Modal.getOrCreateInstance(this.$widget[0]);
         this.$openPasswordOptionsButton = this.$widget.find(".open-password-options-button");
         this.$openPasswordOptionsButton.on("click", () => {
             this.modal.hide();
diff --git a/src/public/app/widgets/dialogs/prompt.ts b/src/public/app/widgets/dialogs/prompt.ts
index ea7c39a9d..6c0fff104 100644
--- a/src/public/app/widgets/dialogs/prompt.ts
+++ b/src/public/app/widgets/dialogs/prompt.ts
@@ -1,6 +1,7 @@
 import { t } from "../../services/i18n.js";
 import utils from "../../services/utils.js";
 import BasicWidget from "../basic_widget.js";
+import { Modal } from "bootstrap";
 
 const TPL = `
 <div class="prompt-dialog modal mx-auto" tabindex="-1" role="dialog" style="z-index: 2000;">
@@ -41,7 +42,7 @@ export default class PromptDialog extends BasicWidget {
     private resolve?: ((value: string | null) => void) | undefined | null;
     private shownCb?: PromptShownDialogCallback | null;
 
-    private modal!: bootstrap.Modal;
+    private modal!: Modal;
     private $dialogBody!: JQuery<HTMLElement>;
     private $question!: JQuery<HTMLElement> | null;
     private $answer!: JQuery<HTMLElement> | null;
@@ -56,9 +57,7 @@ export default class PromptDialog extends BasicWidget {
 
     doRender() {
         this.$widget = $(TPL);
-        // TODO: Fix once we use proper ES imports.
-        //@ts-ignore
-        this.modal = bootstrap.Modal.getOrCreateInstance(this.$widget);
+        this.modal = Modal.getOrCreateInstance(this.$widget[0]);
         this.$dialogBody = this.$widget.find(".modal-body");
         this.$form = this.$widget.find(".prompt-dialog-form");
         this.$question = null;