--- a/AbstractFileBrowser.st	Fri Nov 28 13:20:38 2014 +0100
+++ b/AbstractFileBrowser.st	Fri Nov 28 13:31:39 2014 +0100
@@ -5191,9 +5191,15 @@
 bookmarksMenu
     <resource: #programMenu>
 
+    ^ self bookmarksMenuForBaseSpec:self class baseBookmarksMenuSpec.
+!
+
+bookmarksMenuForBaseSpec:aBaseMenuSpec
+    <resource: #programMenu>
+
     |menu bookmarks|
 
-    menu := self class baseBookmarksMenuSpec decodeAsLiteralArray.
+    menu := aBaseMenuSpec decodeAsLiteralArray.
 
     "/ add the bookmark items ...
     bookmarks := self class directoryBookmarks.
@@ -5230,28 +5236,7 @@
 gotoBookmarksMenu
     <resource: #programMenu>
 
-    |menu bookmarks|
-
-    menu := self class baseBookmarksMenuSpec2 decodeAsLiteralArray.
-
-    "/ add the bookmark items ...
-    bookmarks := self class directoryBookmarks.
-    bookmarks notEmptyOrNil ifTrue:[
-        menu addSeparator.
-        bookmarks do:[:dirName |
-            menu addItem:(MenuItem 
-                            label:dirName asString 
-                            itemValue:[
-                                (self currentSelectedDirectories includes:dirName) ifFalse:[
-                                    self setCurrentFileName:dirName.
-                                ].
-                            ]).
-        ].
-    ].
-    menu findGuiResourcesIn:self.
-    ^ menu
-
-    "Modified: / 14-01-2012 / 21:13:58 / cg"
+    ^ self bookmarksMenuForBaseSpec:self class baseBookmarksMenuSpec2.
 !
 
 menuDirHistory:backOrForward
@@ -9569,10 +9554,10 @@
 !AbstractFileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.571 2014-09-25 15:15:56 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.572 2014-11-28 12:31:39 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.571 2014-09-25 15:15:56 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.572 2014-11-28 12:31:39 cg Exp $'
 ! !