--- a/Tools__NewSystemBrowser.st	Thu Aug 27 16:51:44 2015 +0200
+++ b/Tools__NewSystemBrowser.st	Fri Aug 28 09:48:31 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2000 by eXept Software AG
               All Rights Reserved
@@ -29381,8 +29383,17 @@
 classMenuBrowseClassesPackageDirectory
     "open a filebrowser in the classes package directory"
 
-    UserPreferences fileBrowserClass
-        openIn:(self theSingleSelectedClass theNonMetaclass packageDirectory)
+    |fileBrowser cls dir fn|
+
+    fileBrowser := UserPreferences fileBrowserClass.
+
+    cls := self theSingleSelectedClass theNonMetaclass.
+    dir := cls packageDirectory.
+    (dir asFilename exists and:[(fn := dir / cls classFilename) exists]) ifTrue:[
+        fileBrowser openOn:fn
+    ] ifFalse:[
+        fileBrowser openIn:dir
+    ]
 !
 
 classMenuChangeAspect:aspect