Index: Slim/Plugin/Favorites/HTML/EN/plugins/Favorites/index.html
===================================================================
--- Slim/Plugin/Favorites/HTML/EN/plugins/Favorites/index.html	(revision 18783)
+++ Slim/Plugin/Favorites/HTML/EN/plugins/Favorites/index.html	(working copy)
@@ -26,6 +26,14 @@
 				<input type="hidden" name="removeoncancel" value="[% removeoncancel %]">
 				<input id="edit_title_[% entry.index %]" style="display: inline; width: 35%;" type="text" class="stdedit" name="entrytitle" value="[% entry.title %]" [% IF newentry %] onClick="this.value=''"[% END %]>
 				<input id="edit_url_[% entry.index %]" style="display: inline; width: 35%;" type="text" class="stdedit" name="entryurl" value="[% entry.url %]" [% IF newentry %] onClick="this.value=''"[% END %]>
+				[% IF favorites AND entry.audio %]
+					<select size="1" name="entryhotkey">
+					<option value=""></option>
+						[% FOREACH k IN hotkeys %]
+							<option [% IF k.key == entry.hotkey %]selected[% END %] value="[% k.key %]">[% k.key %][% IF k.used %]*[% END %]</option>
+						[% END %]
+					</select>
+				[% END %]
 				[% IF useAJAX %]
 					<input type="button" class="stdclick" style="display: inline; width: 10%;" value=[% "SAVE" | string %] onclick="editSave('[% entry.index %]', '[% sess %]'); return false;" />
 					<input type="button" class="stdclick" style="display: inline; width: 10%;" value=[% "PLUGIN_FAVORITES_CANCEL" | string %] onclick="editCancel('[% entry.index %]', '[% sess %]'[% IF removeoncancel %],[% removeoncancel %][% END %]); return false;" />
Index: Slim/Plugin/Favorites/OpmlFavorites.pm
===================================================================
--- Slim/Plugin/Favorites/OpmlFavorites.pm	(revision 18783)
+++ Slim/Plugin/Favorites/OpmlFavorites.pm	(working copy)
@@ -276,7 +276,13 @@
 sub hotkeys {
 	my $class = shift;
 
-	return keys %{$class->{'hotkey-index'}};
+	my @keys;
+
+	for my $key (1..9,0) {
+		push @keys, { 'key' => $key, 'used' => $class->{'hotkey-index'}->{ $key } ? 1 : 0 };
+	}
+
+	return \@keys;
 }
 
 sub hasHotkey {
Index: Slim/Plugin/Favorites/Plugin.pm
===================================================================
--- Slim/Plugin/Favorites/Plugin.pm	(revision 18783)
+++ Slim/Plugin/Favorites/Plugin.pm	(working copy)
@@ -519,6 +519,31 @@
 
 					$entry->{'URL'} = $url;
 				}
+
+				if (!$favs) {
+
+					my $hotkey = $params->{'entryhotkey'};
+
+					if (!defined $hotkey || $hotkey eq '') {
+
+						$log->info("removing hotkey from entry");
+
+						delete $entry->{'hotkey'};
+
+					} else {
+
+						my $oldindex = $opml->hasHotkey($hotkey);
+
+						if (defined $oldindex) {
+
+							$opml->setHotkey($oldindex, undef);
+						}
+
+						$log->info("setting hotkey for entry to $hotkey");
+
+						$entry->{'hotkey'} = $hotkey;
+					}
+				}
 			}
 
 			$changed = 1;