Index: Slim/Hardware/IR.pm
===================================================================
--- Slim/Hardware/IR.pm	(revision 8993)
+++ Slim/Hardware/IR.pm	(working copy)
@@ -178,6 +178,8 @@
 
 #returns a reference to a hash of filenames/external names
 sub irfiles {
+	my $client = shift;
+
 	my %irfilelist = ();
 
 	for my $irfiledir (IRFileDirs()) {
@@ -187,6 +189,10 @@
 		for my $irfile ( sort(readdir(DIR)) ) {
 
 			next unless $irfile =~ /(.+)\.ir$/;
+			
+			# NOTE: client isn't required here, but if it's been sent from setup
+			# Don't show front panel ir set for non-transporter clients
+			next if (defined ($client) && !$client->isa('Slim::Player::Transporter') && ($1 eq 'Front_Panel'));
 
 			$::d_ir && msg(" irfile entry: $irfile\n");
 			my $path = catdir($irfiledir,$irfile);
@@ -231,7 +237,7 @@
 		for my $mapfile ( sort(readdir(DIR)) ) {
 
 			next unless $mapfile =~ /(.+)\.map$/;
-
+			
 			$::d_ir && msg(" key mapping file entry: $mapfile\n");
 
 			if ($1 eq defaultMap()) {
Index: Slim/Web/Setup.pm
===================================================================
--- Slim/Web/Setup.pm	(revision 8993)
+++ Slim/Web/Setup.pm	(working copy)
@@ -1139,7 +1139,7 @@
 				}
 				my $i = 0;
 				my %irsets = map {$_ => 1} $client->prefGetArray('disabledirsets');
-				foreach my $irset (sort(keys %{Slim::Hardware::IR::irfiles()})) {
+				foreach my $irset (sort(keys %{Slim::Hardware::IR::irfiles($client)})) {
 					if (exists $paramref->{"irsetlist$i"} && $paramref->{"irsetlist$i"} == (exists $irsets{$irset} ? 0 : 1)) {
 						delete $paramref->{"irsetlist$i"};
 					}
@@ -1156,7 +1156,7 @@
 				my $i = 0;
 				my %irsets = map {$_ => 1} $client->prefGetArray('disabledirsets');
 				$client->prefDelete('disabledirsets');
-				foreach my $irset (sort(keys %{Slim::Hardware::IR::irfiles()})) {
+				foreach my $irset (sort(keys %{Slim::Hardware::IR::irfiles($client)})) {
 					if (!exists $paramref->{"irsetlist$i"}) {
 						$paramref->{"irsetlist$i"} = exists $irsets{$irset} ? 0 : 1;
 					}
@@ -1203,7 +1203,7 @@
 							my ($client,$value,$key) = @_;
 							return if (!defined($client));
 							if ($key =~ /\D+(\d+)$/) {
-								return Slim::Hardware::IR::irfileName((sort(keys %{Slim::Hardware::IR::irfiles()}))[$1]);
+								return Slim::Hardware::IR::irfileName((sort(keys %{Slim::Hardware::IR::irfiles($client)}))[$1]);
 							} else {
 								return $value;
 							}