diff --git a/Frameworks/OakFileBrowser/src/OakFileBrowser.mm b/Frameworks/OakFileBrowser/src/OakFileBrowser.mm
index e2a446fa..6777ad47 100644
--- a/Frameworks/OakFileBrowser/src/OakFileBrowser.mm
+++ b/Frameworks/OakFileBrowser/src/OakFileBrowser.mm
@@ -984,7 +984,13 @@ static NSMutableSet* SymmetricDifference (NSMutableSet* aSet, NSMutableSet* anot
 - (IBAction)goToComputer:(id)sender       { [self goToURL:kURLLocationComputer];  }
 - (IBAction)goToHome:(id)sender           { [self goToURL:kURLLocationHome];      }
 - (IBAction)goToDesktop:(id)sender        { [self goToURL:kURLLocationDesktop];   }
-- (IBAction)goToFavorites:(id)sender      { [self goToURL:kURLLocationFavorites]; }
+
+- (IBAction)goToFavorites:(id)sender
+{
+	if([_url isEqualTo:kURLLocationFavorites] && self.canGoBack)
+			[self goBack:sender];
+	else	[self goToURL:kURLLocationFavorites];
+}
 
 - (IBAction)goToSCMDataSource:(id)sender
 {