diff --git a/public/js/components/Bootstrap/Modal.js b/public/js/components/Bootstrap/Modal.js
index c99aabb58..0e5472477 100644
--- a/public/js/components/Bootstrap/Modal.js
+++ b/public/js/components/Bootstrap/Modal.js
@@ -46,11 +46,12 @@ export default {
 		}
 	},
 	mounted() {
-		this.modal = new bootstrap.Modal(this.$refs.modal, {
-			backdrop: this.backdrop,
-			focus: this.focus,
-			keyboard: this.keyboard
-		});
+		if (this.$refs.modal)
+			this.modal = new bootstrap.Modal(this.$refs.modal, {
+				backdrop: this.backdrop,
+				focus: this.focus,
+				keyboard: this.keyboard
+			});
 	},
 	popup(body, options, title, footer) {
 		const BsModal = this;
@@ -80,8 +81,8 @@ export default {
 				}
 			});
 			const wrapper = document.createElement("div");
-			instance.mount(wrapper);
 			document.body.appendChild(wrapper);
+			instance.mount(wrapper);
 		});
 	},
 	template: `<div ref="modal" class="bootstrap-modal modal" tabindex="-1" @[\`hide.bs.modal\`]="$emit('hideBsModal')" @[\`hidden.bs.modal\`]="$emit('hiddenBsModal')" @[\`hidePrevented.bs.modal\`]="$emit('hidePreventedBsModal')" @[\`show.bs.modal\`]="$emit('showBsModal')" @[\`shown.bs.modal\`]="$emit('shownBsModal')">
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index b36e11bde..de995439f 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -1,6 +1,5 @@
 import DashboardSection from "./Section.js";
 import DashboardWidgetPicker from "./Widget/Picker.js";
-import CachedWidgetLoader from "../../composables/Dashboard/CachedWidgetLoader.js";
 import ObjectUtils from "../../composables/ObjectUtils.js";
 
 export default {
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 2f4772504..17689363a 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -13,7 +13,6 @@ export default {
 		}
 	},
 	props: [
-		"adminMode",
 		"name",
 		"widgets"
 	],
@@ -373,10 +372,6 @@ export default {
 			this.$emit('widgetUpdate', this.name, payload);
 		}
 	},
-	created() {
-		if (this.adminMode)
-			this.editMode = 1;
-	},
 	mounted() {
 		let self = this;
 		let cont = self.$refs.container;