diff --git a/main/ui/src/main/resources/fxml/vault_options_masterkey.fxml b/main/ui/src/main/resources/fxml/vault_options_masterkey.fxml
index 52a8b00fa..75c14c9cb 100644
--- a/main/ui/src/main/resources/fxml/vault_options_masterkey.fxml
+++ b/main/ui/src/main/resources/fxml/vault_options_masterkey.fxml
@@ -16,34 +16,33 @@
 		<Insets topRightBottomLeft="12"/>
 	</padding>
 	<children>
-		<HBox spacing="6" alignment="CENTER">
-			<Button text="%vaultOptions.masterkey.changePasswordBtn" onAction="#changePassword" contentDisplay="LEFT">
+		<VBox spacing="6" alignment="CENTER">
+			<Button text="%vaultOptions.masterkey.changePasswordBtn" onAction="#changePassword" contentDisplay="LEFT" maxWidth="Infinity">
 				<graphic>
 					<FontAwesome5IconView glyph="KEY"/>
 				</graphic>
 			</Button>
-			<Button text="%vaultOptions.masterkey.forgetSavedPasswordBtn" onAction="#removePasswordFromKeychain" contentDisplay="LEFT" visible="${controller.passwordSaved}" managed="${controller.passwordSaved}">
+			<Button text="%vaultOptions.masterkey.forgetSavedPasswordBtn" onAction="#removePasswordFromKeychain" contentDisplay="LEFT" maxWidth="Infinity" visible="${controller.passwordSaved}"
+					managed="${controller.passwordSaved}">
 				<graphic>
 					<FontAwesome5IconView glyph="UNLINK"/>
 				</graphic>
 			</Button>
-		</HBox>
+		</VBox>
 		<Region VBox.vgrow="ALWAYS"/>
-
 		<Label maxWidth="-Infinity" text="%vaultOptions.masterkey.recoveryKeyExpanation" wrapText="true"/>
-		<HBox spacing="6" alignment="CENTER">
-			<Button text="%vaultOptions.masterkey.showRecoveryKeyBtn" onAction="#showRecoveryKey" contentDisplay="LEFT">
+		<VBox spacing="6" alignment="CENTER">
+			<Button text="%vaultOptions.masterkey.showRecoveryKeyBtn" onAction="#showRecoveryKey" contentDisplay="LEFT" maxWidth="Infinity">
 				<graphic>
 					<FontAwesome5IconView glyph="EYE"/>
 				</graphic>
 			</Button>
-			<Button text="%vaultOptions.masterkey.recoverPasswordBtn" onAction="#showRecoverVaultDialogue" contentDisplay="LEFT">
+			<Button text="%vaultOptions.masterkey.recoverPasswordBtn" onAction="#showRecoverVaultDialogue" contentDisplay="LEFT" maxWidth="Infinity">
 				<graphic>
 					<FontAwesome5IconView glyph="SYNC"/>
 				</graphic>
 			</Button>
-		</HBox>
-
+		</VBox>
 		<Region VBox.vgrow="ALWAYS"/>
 	</children>
 </VBox>