--- a/AbstractSettingsApplication.st	Fri May 20 14:46:05 2016 +0200
+++ b/AbstractSettingsApplication.st	Wed May 25 21:24:39 2016 +0200
@@ -16211,18 +16211,18 @@
 
     cacheDir := self sourceCacheDir value.    
     cacheDir isNil ifTrue:[
-        AbstractSourceCodeManager cachingSources ifFalse:[
-            (Dialog confirm:'No cache directory defined. Setup now?') ifTrue:[
-                AbstractSourceCodeManager cachingSources:true.
-                self browseSourceCache
-            ].            
-        ] ifFalse:[
+        AbstractSourceCodeManager cachingSources ifTrue:[
             AbstractSourceCodeManager initCacheDirPath.
             cacheDir := self sourceCacheDir value.    
             cacheDir isNil ifTrue:[
                 Dialog information:'Failed to setup a default cache directory. Please enter manually'.
                 ^ self.
             ].            
+        ] ifFalse:[
+            (Dialog confirm:'No cache directory defined. Setup now?') ifTrue:[
+                AbstractSourceCodeManager cachingSources:true.
+                self browseSourceCache
+            ].            
         ].    
     ].    
     UserPreferences fileBrowserClass openOn:cacheDir