diff --git a/build.xml b/build.xml
index 9cad66a2..4c33f31c 100644
--- a/build.xml
+++ b/build.xml
@@ -213,7 +213,8 @@
 			<classpath file="${path.fatjar}" />
 			<librarypath dir="${dir.lib}/native/mac-x86_64" />
 			<arch name="x86_64" />
-
+			
+			<option value="-Dnet.filebot.UserFiles.fileChooser=COCOA" />	
 			<option value="-Dapplication.deployment=app" />
 			<option value="-Dapplication.update=auto" />
 			<option value="-Dunixfs=false" />
diff --git a/source/net/filebot/UserFiles.java b/source/net/filebot/UserFiles.java
index 4280c42b..ab3a75ac 100644
--- a/source/net/filebot/UserFiles.java
+++ b/source/net/filebot/UserFiles.java
@@ -200,30 +200,12 @@ public class UserFiles {
 
 		COCOA {
 
-			// private final String KEY_NSOPENPANEL_BROKEN = "NSOPENPANEL_BROKEN";
-
 			@Override
 			public List<File> showLoadDialogSelectFiles(boolean folderMode, boolean multiSelection, File defaultFile, ExtensionFileFilter filter, String title, ActionEvent evt) {
 				// directly use NSOpenPanel for via Objective-C bridge for FILES_AND_DIRECTORIES mode
 				if (folderMode && filter != null) {
-					// NSOpenPanel causes deadlocks on some machines
-					// Preferences persistence = Preferences.userNodeForPackage(UserFiles.class);
-					// if (!persistence.getBoolean(KEY_NSOPENPANEL_BROKEN, false)) {
-					try {
-						// assume that NSOpenPanel may freeze the application until it is killed, and make sure to not use NSOpenPanel on subsequent runs
-						// persistence.putBoolean(KEY_NSOPENPANEL_BROKEN, true);
-						// persistence.flush();
-
-						// call native NSOpenPanel openPanel via Objective-C bridge
-						return MacAppUtilities.NSOpenPanel_openPanel_runModal(title, true, true, true, filter.acceptAny() ? null : filter.extensions());
-					} catch (Throwable e) {
-						Logger.getLogger(UserFiles.class.getName()).log(Level.WARNING, e.toString());
-					} finally {
-						// persistence.putBoolean(KEY_NSOPENPANEL_BROKEN, false); // NSOpenPanel did not freeze application
-					}
-					// } else {
-					// Logger.getLogger(UserFiles.class.getName()).log(Level.WARNING, "NSOpenPanel broken. Using AWT implementation instead.");
-					// }
+					// call native NSOpenPanel openPanel via Objective-C bridge
+					return MacAppUtilities.NSOpenPanel_openPanel_runModal(title, true, true, true, filter.acceptAny() ? null : filter.extensions());
 				}
 
 				// default to AWT implementation