diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 8c1f75b5de..0821876ee2 100644
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -1142,19 +1142,15 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 		}
 		case RC_VIEWER_ALTERNATIVES:  {
 			string format, command;
-			if (lexrc.next())
-				format = lexrc.getString();
-			if (lexrc.eatLine())
-				command = lexrc.getString();
+			lexrc >> format;
+			lexrc >> command;
 			viewer_alternatives[format].insert(command);
 			break;
 		}
 		case RC_EDITOR_ALTERNATIVES:  {
 			string format, command;
-			if (lexrc.next())
-				format = lexrc.getString();
-			if (lexrc.eatLine())
-				command = lexrc.getString();
+			lexrc >> format;
+			lexrc >> command;
 			editor_alternatives[format].insert(command);
 			break;
 		}