diff --git a/src/components/NcActionInput/NcActionInput.vue b/src/components/NcActionInput/NcActionInput.vue
index 41444990b8..238fd6a1f9 100644
--- a/src/components/NcActionInput/NcActionInput.vue
+++ b/src/components/NcActionInput/NcActionInput.vue
@@ -33,6 +33,11 @@ For the multiselect component, all events will be passed through. Please see the
 					<Pencil :size="20" />
 				</template>
 			</NcActionInput>
+			<NcActionInput :value.sync="text" :show-trailing-button="false">
+				<template #icon>
+					<Pencil :size="20" />
+				</template>
+			</NcActionInput>
 			<NcActionInput :value.sync="text">
 				<template #icon>
 					<Pencil :size="20" />
@@ -45,6 +50,12 @@ For the multiselect component, all events will be passed through. Please see the
 				</template>
 				Password placeholder
 			</NcActionInput>
+			<NcActionInput type="password" :value.sync="text" :show-trailing-button="false">
+				<template #icon>
+					<Key :size="20" />
+				</template>
+				Password placeholder
+			</NcActionInput>
 			<NcActionInput type="color" :value.sync="color">
 				<template #icon>
 					<Eyedropper :size="20" />
@@ -191,7 +202,7 @@ For the multiselect component, all events will be passed through. Please see the
 								:disabled="disabled"
 								:input-class="{ focusable: isFocusable }"
 								trailing-button-icon="arrowRight"
-								:show-trailing-button="value !== '' && !disabled"
+								:show-trailing-button="showTrailingButton && value !== '' && !disabled"
 								v-bind="$attrs"
 								v-on="$listeners"
 								@trailing-button-click="$refs.form.requestSubmit()"
@@ -219,7 +230,7 @@ For the multiselect component, all events will be passed through. Please see the
 								:input-class="{ focusable: isFocusable }"
 								:type="type"
 								trailing-button-icon="arrowRight"
-								:show-trailing-button="value !== '' && !disabled"
+								:show-trailing-button="showTrailingButton && value !== '' && !disabled"
 								v-bind="$attrs"
 								v-on="$listeners"
 								@trailing-button-click="$refs.form.requestSubmit()"
@@ -349,6 +360,13 @@ export default {
 			type: Boolean,
 			default: null,
 		},
+		/**
+		 * Attribute forwarded to the underlining NcPasswordField and NcTextField
+		 */
+		showTrailingButton: {
+			type: Boolean,
+			default: true,
+		},
 	},
 
 	emits: [
diff --git a/src/components/NcPasswordField/NcPasswordField.vue b/src/components/NcPasswordField/NcPasswordField.vue
index 79cd220079..7533c03652 100644
--- a/src/components/NcPasswordField/NcPasswordField.vue
+++ b/src/components/NcPasswordField/NcPasswordField.vue
@@ -97,7 +97,7 @@ export default {
 	<NcInputField v-bind="{...$attrs, ...$props }"
 		ref="inputField"
 		:type="isPasswordHidden ? 'password' : 'text'"
-		:show-trailing-button="true"
+		:show-trailing-button="showTrailingButton && true"
 		:trailing-button-label="trailingButtonLabelPassword"
 		:helper-text="computedHelperText"
 		:error="computedError"
@@ -181,6 +181,14 @@ export default {
 			type: Number,
 			default: null,
 		},
+
+		/**
+		 * Controls whether to display the trailing button.
+		 */
+		showTrailingButton: {
+			type: Boolean,
+			default: true,
+		},
 	},
 
 	emits: [