diff --git a/app/src/components/v-chip/v-chip.vue b/app/src/components/v-chip/v-chip.vue
index 90680abd0383c..7494a364ddbab 100644
--- a/app/src/components/v-chip/v-chip.vue
+++ b/app/src/components/v-chip/v-chip.vue
@@ -162,6 +162,7 @@ body {
 	.chip-content {
 		display: inline-flex;
 		align-items: center;
+		white-space: nowrap;
 
 		.close-outline {
 			position: relative;
diff --git a/app/src/components/v-form/form-field-label.vue b/app/src/components/v-form/form-field-label.vue
index d7d51b533fd6a..91d588ca485f7 100644
--- a/app/src/components/v-form/form-field-label.vue
+++ b/app/src/components/v-form/form-field-label.vue
@@ -1,12 +1,12 @@
 <template>
 	<div class="field-label type-label" :class="{ disabled, edited: edited && !batchMode && !hasError && !loading }">
-		<v-checkbox
-			v-if="batchMode"
-			:model-value="batchActive"
-			:value="field.field"
-			@update:model-value="$emit('toggle-batch', field)"
-		/>
 		<span class="field-name" @click="toggle">
+			<v-checkbox
+				v-if="batchMode"
+				:model-value="batchActive"
+				:value="field.field"
+				@update:model-value="$emit('toggle-batch', field)"
+			/>
 			<span v-if="edited" v-tooltip="t('edited')" class="edit-dot"></span>
 			<v-text-overflow :text="field.name" />
 			<v-icon v-if="field.meta?.required === true" class="required" :class="{ 'has-badge': badge }" sup name="star" />