diff --git a/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java b/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
index 2daf575ca..c7662daeb 100644
--- a/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
+++ b/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
@@ -170,7 +170,8 @@ public class MountOptionsController implements FxController {
 		} catch (NoDirSelectedException e) {
 			if (!mountPointDirBtn.equals(oldToggle)) {
 				mountPointToggleGroup.selectToggle(oldToggle);
-
+			} else {
+				mountPointToggleGroup.selectToggle(mountPointAutoBtn);
 			}
 		}
 	}