diff --git a/app/src/modules/collections/components/navigation-bookmark.vue b/app/src/modules/collections/components/navigation-bookmark.vue
index 4903d8616b..5ba163b02e 100644
--- a/app/src/modules/collections/components/navigation-bookmark.vue
+++ b/app/src/modules/collections/components/navigation-bookmark.vue
@@ -35,7 +35,9 @@
 				</v-card-text>
 				<v-card-actions>
 					<v-button secondary @click="renameActive = false">{{ $t('cancel') }}</v-button>
-					<v-button @click="renameSave" :loading="renameSaving">{{ $t('save') }}</v-button>
+					<v-button @click="renameSave" :disabled="renameValue === null" :loading="renameSaving">
+						{{ $t('save') }}
+					</v-button>
 				</v-card-actions>
 			</v-card>
 		</v-dialog>
diff --git a/app/src/modules/files/components/add-folder.vue b/app/src/modules/files/components/add-folder.vue
index f769ec89a0..5ea674f119 100644
--- a/app/src/modules/files/components/add-folder.vue
+++ b/app/src/modules/files/components/add-folder.vue
@@ -20,7 +20,7 @@
 			</v-card-text>
 			<v-card-actions>
 				<v-button secondary @click="dialogActive = false">{{ $t('cancel') }}</v-button>
-				<v-button :disabled="!newFolderName || newFolderName.length === 0" @click="addFolder" :loading="saving">
+				<v-button :disabled="newFolderName === null" @click="addFolder" :loading="saving">
 					{{ $t('save') }}
 				</v-button>
 			</v-card-actions>
diff --git a/app/src/modules/files/components/navigation-folder.vue b/app/src/modules/files/components/navigation-folder.vue
index 5517c5fffc..7b9e330261 100644
--- a/app/src/modules/files/components/navigation-folder.vue
+++ b/app/src/modules/files/components/navigation-folder.vue
@@ -74,7 +74,9 @@
 				</v-card-text>
 				<v-card-actions>
 					<v-button secondary @click="renameActive = false">{{ $t('cancel') }}</v-button>
-					<v-button @click="renameSave" :loading="renameSaving">{{ $t('save') }}</v-button>
+					<v-button @click="renameSave" :disabled="renameValue === null" :loading="renameSaving">
+						{{ $t('save') }}
+					</v-button>
 				</v-card-actions>
 			</v-card>
 		</v-dialog>
diff --git a/app/src/modules/settings/routes/data-model/fields/components/field-select.vue b/app/src/modules/settings/routes/data-model/fields/components/field-select.vue
index b08ecbf547..943aac3703 100644
--- a/app/src/modules/settings/routes/data-model/fields/components/field-select.vue
+++ b/app/src/modules/settings/routes/data-model/fields/components/field-select.vue
@@ -172,7 +172,7 @@
 					<v-button secondary @click="duplicateActive = false">
 						{{ $t('cancel') }}
 					</v-button>
-					<v-button @click="saveDuplicate" :loading="duplicating">
+					<v-button @click="saveDuplicate" :disabled="duplicateName === null" :loading="duplicating">
 						{{ $t('duplicate') }}
 					</v-button>
 				</v-card-actions>
diff --git a/app/src/modules/settings/routes/roles/add-new.vue b/app/src/modules/settings/routes/roles/add-new.vue
index 1f5edba175..8daf5f4a67 100644
--- a/app/src/modules/settings/routes/roles/add-new.vue
+++ b/app/src/modules/settings/routes/roles/add-new.vue
@@ -23,7 +23,7 @@
 			</v-card-text>
 			<v-card-actions>
 				<v-button to="/settings/roles" secondary>{{ $t('cancel') }}</v-button>
-				<v-button @click="save" :loading="saving">{{ $t('save') }}</v-button>
+				<v-button @click="save" :disabled="roleName === null" :loading="saving">{{ $t('save') }}</v-button>
 			</v-card-actions>
 		</v-card>
 	</v-dialog>
@@ -38,7 +38,7 @@ import { unexpectedError } from '@/utils/unexpected-error';
 
 export default defineComponent({
 	setup() {
-		const roleName = ref<string>();
+		const roleName = ref<string | null>(null);
 		const appAccess = ref(true);
 		const adminAccess = ref(false);