Index: IR/Default.map
===================================================================
--- IR/Default.map	(revision 20894)
+++ IR/Default.map	(working copy)
@@ -37,14 +37,14 @@
 knob_left				= up
 knob_left.repeat		= up_repeat
 rew.single				= jump_rew
-rew.hold				= scan_rew
+rew.hold				= song_scanner
 brightness_down			= brightness_down
 brightness_up			= brightness_up
 brightness.single		= brightness_toggle
 brightness.hold			= dead
 brightness				= dead
 fwd.single				= jump_fwd
-fwd.hold				= scan_fwd
+fwd.hold				= song_scanner
 format					= titleFormat
 muting					= muting
 pause.single			= pause
Index: Slim/Plugin/SongScanner/Plugin.pm
===================================================================
--- Slim/Plugin/SongScanner/Plugin.pm	(revision 20894)
+++ Slim/Plugin/SongScanner/Plugin.pm	(working copy)
@@ -404,8 +404,7 @@
 # Set up scanner to be called by default on fwd.hold and rew.hold from all modes
 sub initPlugin {
 	my $class = shift;
-	# Single press of fwd/rew triggers ffwd/rewind
-	Slim::Hardware::IR::addModeDefaultMapping('common', {'fwd.hold' => 'song_scanner', 'rew.hold' => 'song_scanner'}, 1);
+	
 	# Holding fwd and rew moves the scanner bar left/right
 	Slim::Hardware::IR::addModeDefaultMapping($modeName,
 		{'fwd.repeat' => 'song_scanner_fwd', 'rew.repeat' => 'song_scanner_rew',