--- a/ImageEditor.st	Mon Dec 16 14:42:41 2013 +0100
+++ b/ImageEditor.st	Thu Jan 16 15:32:51 2014 +0100
@@ -6336,9 +6336,10 @@
 
     title := (resources string:'Load Image From').
 
-    UserPreferences current useNativeFileDialog ifTrue:[
+    (UserPreferences current useNativeFileDialog
+     and:[Screen current platformName = #WIN32]) ifTrue:[
         self withWaitCursorDo:[
-            file := Display
+            file := Screen current
                 nativeFileDialogFor:(self window topView id)
                 save:false
                 title:title
@@ -6599,9 +6600,10 @@
 
     filters := FileSelectionBrowser saveImageFileNameFilters.
 
-    UserPreferences current useNativeFileDialog ifTrue:[
+    (UserPreferences current useNativeFileDialog
+     and:[Screen current platformName = #WIN32]) ifTrue:[
         self withWaitCursorDo:[
-            file := Display
+            file := Screen current
                 nativeFileDialogFor:(self window topView id)
                 save:true
                 title:(resources string:'Save Image To')