diff --git a/main/ui/src/main/resources/fxml/vault_options_autolock.fxml b/main/ui/src/main/resources/fxml/vault_options_autolock.fxml
index 18a91f38d..a2f14453f 100644
--- a/main/ui/src/main/resources/fxml/vault_options_autolock.fxml
+++ b/main/ui/src/main/resources/fxml/vault_options_autolock.fxml
@@ -4,8 +4,9 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Text?>
+<?import javafx.scene.text.TextFlow?>
 <VBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.vaultoptions.AutoLockVaultOptionsController"
@@ -15,10 +16,13 @@
 	</padding>
 	<children>
 		<CheckBox text="%vaultOptions.autoLock.lockOnSleep" fx:id="lockOnSleepCheckbox"/>
-		<CheckBox text="%vaultOptions.autoLock.lockAfterIdleTime" fx:id="lockAfterIdleTimeCheckbox"/>
-		<HBox>
-			<FormattedLabel format="%vaultOptions.autoLock.lockAfterAmountOfIdleTime"/>
-			<TextField fx:id="lockIdleTimeInMinutesTextField"/>
-		</HBox>
+		<TextFlow styleClass="text-flow" prefWidth="-Infinity">
+			<CheckBox text="%vaultOptions.autoLock.lockAfterIdleTimePart1" fx:id="lockAfterIdleTimeCheckbox"/>
+			<Text text=" "/>
+			<TextField fx:id="lockIdleTimeInMinutesTextField" prefWidth="50"/> <!--prefWidth="${controller.calculatedWidthForTextfield}"/>-->
+			<Text text=" "/>
+			<FormattedLabel format="%vaultOptions.autoLock.lockAfterIdleTimePart2"/>
+		</TextFlow>
+
 	</children>
 </VBox>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 2ef5d89cc..fc66d90ea 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -295,7 +295,8 @@ vaultOptions.masterkey.recoverPasswordBtn=Recover Password
 ## Auto Lock
 vaultOptions.autoLock=Auto-Lock
 vaultOptions.autoLock.lockOnSleep=Lock on sleep
-vaultOptions.autoLock.lockAfterIdleTime=Lock after computer is idle for x minutes
+vaultOptions.autoLock.lockAfterIdleTimePart1=Lock after computer is idle for
+vaultOptions.autoLock.lockAfterIdleTimePart2=minutes.
 vaultOptions.autoLock.lockAfterAmountOfIdleTime=Following minutes are set: 
 
 # Recovery Key