diff --git a/ChangeLog b/ChangeLog
index b0864a9..db30e9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-10-15  Vladimir Serbinenko  <phcoder@gmail.com>
 
+	* script/sh/lexer.c (grub_script_yylex): Prevent character from changing
+	state twice.
+
+2009-10-15  Vladimir Serbinenko  <phcoder@gmail.com>
+
 	* loader/i386/pc/xnu.c (grub_xnu_set_video): Fix loading splash image.
 
 2009-10-15  Vladimir Serbinenko  <phcoder@gmail.com>
diff --git a/script/sh/lexer.c b/script/sh/lexer.c
index a30e3c0..0c71dae 100644
--- a/script/sh/lexer.c
+++ b/script/sh/lexer.c
@@ -350,9 +350,11 @@ grub_script_yylex (union YYSTYPE *yylval, struct grub_parser_param *parsestate)
 	      if (! (check_varstate (newstate)))
 		{
 		  if (state->state == GRUB_PARSER_STATE_VARNAME2
-		  || state->state == GRUB_PARSER_STATE_QVARNAME2)
-		    nextchar (state);
-		  state->state = newstate;
+		      || state->state == GRUB_PARSER_STATE_QVARNAME2)
+		    {
+		      nextchar (state);
+		      state->state = newstate;
+		    }
 		  break;
 		}
 
@@ -378,7 +380,6 @@ grub_script_yylex (union YYSTYPE *yylval, struct grub_parser_param *parsestate)
 
 	  buffer[bufpos++] = 0;
 
-	  state->state = newstate;
 	  yylval->arg = grub_script_arg_add (parsestate, yylval->arg,
 					     GRUB_SCRIPT_ARG_TYPE_VAR, buffer);
 	  grub_dprintf ("scripting", "vartoken=`%s'\n", buffer);