Index: Slim/Buttons/AlarmClock.pm
===================================================================
--- Slim/Buttons/AlarmClock.pm	(revision 3609)
+++ Slim/Buttons/AlarmClock.pm	(working copy)
@@ -85,7 +85,7 @@
 			my %params = (
 				'header' => $client->string('ALARM_SET')
 				,'valueRef' => Slim::Utils::Prefs::clientGet($client,"alarmtime")
-				,'cursorPos' => 1
+				,'cursorPos' => 0
 				,'callback' => \&exitSetHandler
 				,'onChange' => sub { Slim::Utils::Prefs::clientSet($_[0],"alarmtime",Slim::Buttons::Common::param($_[0],'valueRef')); }
 				,'onChangeArgs' => 'C'
Index: Slim/Buttons/Input/Time.pm
===================================================================
--- Slim/Buttons/Input/Time.pm	(revision 3607)
+++ Slim/Buttons/Input/Time.pm	(working copy)
@@ -84,7 +84,6 @@
 			my $time = ($h0 * 10 + $h1) * 60 * 60 + $m0 * 10 * 60 + $m1 * 60 + $p * 12 * 60 * 60;
 			$client->param('valueRef',$time);
 			
-			Slim::Utils::Timers::setTimer($client, Time::HiRes::time() + Slim::Utils::Prefs::get("displaytexttimeout"), \&nextChar);
 			#update the display
 			my $onChange = $client->param('onChange');
 			if (ref($onChange) eq 'CODE') {