diff --git a/apps/bookmark.c b/apps/bookmark.c
index 82a23fbbc9..cce8ef88bf 100644
--- a/apps/bookmark.c
+++ b/apps/bookmark.c
@@ -125,6 +125,9 @@ bool bookmark_create_menu(void)
 /* ----------------------------------------------------------------------- */
 bool bookmark_load_menu(void)
 {
+    bool ret = false;
+
+    push_current_activity(ACTIVITY_BOOKMARKSLIST);
     if (is_bookmarkable_state())
     {
         char* name = playlist_get_name(NULL, global_temp_buffer,
@@ -135,12 +138,13 @@ bool bookmark_load_menu(void)
             
             if (bookmark != NULL)
             {
-                return play_bookmark(bookmark);
+                ret = play_bookmark(bookmark);
             }
         }
     }
 
-    return false;
+    pop_current_activity();
+    return ret;
 }
 
 /* ----------------------------------------------------------------------- */
diff --git a/docs/CREDITS b/docs/CREDITS
index e59054df8a..3619b6aea8 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -620,6 +620,7 @@ Cástor Muñoz
 Albert Barca
 Fukuda Takafumi
 Dimitar Dimitrov
+Osborne Jacobs
 
 The libmad team
 The wavpack team