diff --git a/public/js/apps/Dashboard/WidgetAdmin.js b/public/js/apps/Dashboard/WidgetAdmin.js
index 6c92a919b..d62296f5f 100644
--- a/public/js/apps/Dashboard/WidgetAdmin.js
+++ b/public/js/apps/Dashboard/WidgetAdmin.js
@@ -24,7 +24,7 @@ const app = Vue.createApp({
 		<div class="content d-flex flex-column gap-3 w-100 h-100 overflow-hidden">
 			<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3">
 				<h1 class="h2 pb-3 border-bottom mb-0 w-100">
-					{{ $p.t('dashboard/widgets') }}
+					{{ $p.t('dashboard/widgets') || '&nbsp;' }}
 				</h1>
 			</div>
 			<widget-admin class="h-100 overflow-hidden" />
diff --git a/public/js/components/Dashboard/WidgetAdmin/Edit.js b/public/js/components/Dashboard/WidgetAdmin/Edit.js
index f04bdb405..7896f84e4 100644
--- a/public/js/components/Dashboard/WidgetAdmin/Edit.js
+++ b/public/js/components/Dashboard/WidgetAdmin/Edit.js
@@ -96,15 +96,22 @@ export default {
 	<core-form
 		v-if="modelValue"
 		ref="form"
-		class="widgets-admin-edit mx-2"
+		class="widgets-admin-edit mx-2 pb-5"
 		@submit.prevent="save"
 	>
-		<edit-basics v-model="value" :original="originalData" />
+		<edit-basics v-model="value" :original="originalData" class="border-bottom mb-3" />
 		<template v-if="generator">
-			<component :is="generator" v-model="value" :original="originalData" :key="modelValue.widget_id" />
+			<component
+				:is="generator"
+				v-model="value"
+				:original="originalData"
+				:key="modelValue.widget_id"
+			/>
 		</template>
-		<edit-setup v-else v-model="setup" />
-		<div class="position-absolute bottom-0 end-0 z-3">
+		<template v-else>
+			<edit-setup v-model="setup" />
+		</template>
+		<div class="position-absolute mx-2 my-1 bottom-0 end-0 z-3">
 			<button
 				v-if="generator"
 				type="button"
diff --git a/public/js/components/Dashboard/WidgetAdmin/Edit/Basics.js b/public/js/components/Dashboard/WidgetAdmin/Edit/Basics.js
index ac1ccedad..c738d021b 100644
--- a/public/js/components/Dashboard/WidgetAdmin/Edit/Basics.js
+++ b/public/js/components/Dashboard/WidgetAdmin/Edit/Basics.js
@@ -20,7 +20,7 @@ export default {
 		}
 	},
 	template: /* html */`
-	<div class="widgets-admin-edit-basics border-bottom mb-3">
+	<div class="widgets-admin-edit-basics">
 		<div class="d-flex gap-3 my-2">
 			<div class="col-auto">
 				<img
diff --git a/public/js/components/Dashboard/WidgetAdmin/Edit/Setup.js b/public/js/components/Dashboard/WidgetAdmin/Edit/Setup.js
index 70d706ff7..2c9c383cf 100644
--- a/public/js/components/Dashboard/WidgetAdmin/Edit/Setup.js
+++ b/public/js/components/Dashboard/WidgetAdmin/Edit/Setup.js
@@ -17,7 +17,7 @@ export default {
 		"update:modelValue"
 	],
 	template: /* html */`
-	<div class="widgets-admin-edit-setup border-bottom mb-3">
+	<div class="widgets-admin-edit-setup">
 		<form-input
 			v-model="modelValue.name"
 			type="text"