diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/LargeFileLimitsPreferenceHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/LargeFileLimitsPreferenceHandler.java
index 2048d77..f89bdac 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/LargeFileLimitsPreferenceHandler.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/LargeFileLimitsPreferenceHandler.java
@@ -542,6 +542,8 @@
 
 		@Override
 		public void prompt(IPath inputPath, FileLimit fileLimit) {
+			selectedEditor = null;
+			rememberSelection = false;
 			Shell shell = ProgressManagerUtil.getDefaultParent();
 			LargeFileEditorSelectionDialog dialog =
 					new LargeFileEditorSelectionDialog(shell, inputPath.getFileExtension(), fileLimit.fileSize);
@@ -569,13 +571,13 @@
 		private final long fileSize;
 
 		private Button rememberSelectionButton;
-		private boolean rememberSelection = DEFAULT_REMEMBER_EDITOR_SELECTION;
+		private boolean rememberSelection;
 
 		public LargeFileEditorSelectionDialog(Shell shell, String extension, long size) {
 			super(shell);
 			this.extension = extension;
 			this.fileSize = size;
-			rememberSelection = false;
+			rememberSelection = DEFAULT_REMEMBER_EDITOR_SELECTION;
 		}
 
 		@Override