diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/favorite-index.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/favorite-index.js
index 0098e04f..b4647321 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/favorite-index.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/favorite-index.js
@@ -12,7 +12,13 @@ Location: wtv-favorite:/favorite`
 var folder_array = session_data.favstore.getFolders();
 var url = request_headers.request;
 var key = url.split('?')[1]
-
-headers = `400 You have not assigned a favorite to ${key}`
-
+var scfav = session_data.favstore.getShortcutKey(key);
+if (!scfav.id || scfav.id == "none") {
+	headers = `400 You have not assigned a favorite to ${key}`
+} else {
+	var fav = session_data.favstore.getFavorite(scfav.folder, scfav.id);
+	headers = `300 OK
+Content-Type: text/html
+Location: ${fav.url}`
+}
 }
\ No newline at end of file
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-shortcut-list.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-shortcut-list.js
index 200c0d19..b1a62839 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-shortcut-list.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-shortcut-list.js
@@ -34,7 +34,7 @@ Keyboard shortcut list
 <img src="wtv-home:/ROMCache/Spacer.gif" width="1" height="1">	</td></tr><tr><td absheight="32" colspan="3" width="100%">
 <table cellspacing="0" cellpadding="0">
 <tbody><tr><td abswidth="6" absheight="26">
-</td><td width="100%"><table href="wtv-favorite:/serve-browser?favorite-folder-name=Personal" width="100%" cellspacing="0" cellpadding="0">
+</td><td width="100%"><table href="wtv-favorite:/favorite" width="100%" cellspacing="0" cellpadding="0">
 <tbody><tr><td>
 <table cellspacing="0" cellpadding="0">
 <tbody><tr><td><shadow><font size="-1" color="E7CE4A">
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/login-stage-two.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/login-stage-two.js
index e97d49cf..86c335ec 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/login-stage-two.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/login-stage-two.js
@@ -148,6 +148,7 @@ passport-domain: ${session_data.getSessionData("messenger_domain")}
 wtv-mail-url: wtv-mail:/listmail
 wtv-favorite-url: wtv-favorite:/favorite
 wtv-favorites-folders-url: wtv-favorite:/list-folders
+wtv-favorite-index-url: wtv-favorite:/favorite-index?
 wtv-input-timeout: 14400
 wtv-connection-timeout: 1440
 wtv-fader-timeout: 1440