diff --git a/app/src/components/v-form/form-field-menu.vue b/app/src/components/v-form/form-field-menu.vue
index 8a27ff84e5..61c571cd27 100644
--- a/app/src/components/v-form/form-field-menu.vue
+++ b/app/src/components/v-form/form-field-menu.vue
@@ -1,13 +1,13 @@
 <template>
 	<v-list dense>
+		<v-list-item @click="$emit('edit-raw')">
+			<v-list-item-icon><v-icon name="code" /></v-list-item-icon>
+			<v-list-item-content>{{ $t('edit_raw') }}</v-list-item-content>
+		</v-list-item>
 		<v-list-item :disabled="value === null" @click="$emit('input', null)">
 			<v-list-item-icon><v-icon name="delete_outline" /></v-list-item-icon>
 			<v-list-item-content>{{ $t('clear_value') }}</v-list-item-content>
 		</v-list-item>
-		<v-list-item @click="$emit('edit-raw')">
-			<v-list-item-icon><v-icon name="edit" /></v-list-item-icon>
-			<v-list-item-content>{{ $t('edit_raw') }}</v-list-item-content>
-		</v-list-item>
 		<v-list-item @click="$emit('input', defaultValue)">
 			<v-list-item-icon>
 				<v-icon name="settings_backup_restore" />
diff --git a/app/src/components/v-form/form-field.vue b/app/src/components/v-form/form-field.vue
index 6cc58e329f..7c5f17459e 100644
--- a/app/src/components/v-form/form-field.vue
+++ b/app/src/components/v-form/form-field.vue
@@ -39,7 +39,7 @@
 		/>
 
 		<v-modal :active="showRawModal" :title="$t('edit_raw_value')" :subtitle="type">
-			<v-textarea v-model="rawString" placeholder="$t('enter_raw_value')"></v-textarea>
+			<v-textarea v-model="rawString" :placeholder="$t('enter_raw_value')"></v-textarea>
 			<template #footer>
 				<v-button secondary @click="undoRaw">
 					{{ $t('cancel') }}
@@ -67,6 +67,7 @@ import FormFieldLabel from './form-field-label.vue';
 import FormFieldMenu from './form-field-menu.vue';
 import FormFieldInterface from './form-field-interface.vue';
 import { ValidationError } from './types';
+import { capitalizeFirst } from '@/utils/capitalize-first';
 
 export default defineComponent({
 	components: { FormFieldLabel, FormFieldMenu, FormFieldInterface },
@@ -183,7 +184,7 @@ export default defineComponent({
 				raw.value = rawString.value;
 			}
 
-			return { showRawModal, rawString, editRaw, saveRaw, undoRaw, type };
+			return { showRawModal, rawString, editRaw, saveRaw, undoRaw, type: capitalizeFirst(type.value) };
 		}
 	},
 });
diff --git a/app/src/lang/en-US/index.json b/app/src/lang/en-US/index.json
index 1a7e85d725..efd5bd7af3 100644
--- a/app/src/lang/en-US/index.json
+++ b/app/src/lang/en-US/index.json
@@ -245,8 +245,9 @@
 	"database_type": "Database Datatype",
 	"finish_setup": "Finish Setup",
 	"dismiss": "Dismiss",
-	"edit_raw": "Edit raw",
-	"edit_raw_value": "Edit raw value",
+	"edit_raw": "Raw value",
+	"edit_raw_value": "Edit Raw Value",
+	"enter_raw_value": "Enter raw value...",
 	"clear_value": "Clear value",
 	"reset_to_default": "Reset to default",
 	"undo_changes": "Undo changes",