diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index a75996507..a8a29ea67 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,4 +1,6 @@
 Changes towards version 0.3:
+- Fix issue with caps lock and num lock preventing planet scan
+  and lander message skipping (bug #299), from chmmravatar
 - Subtitles are now hidden after alien has finished talking (bug #312),
   from chmmravatar
 - Fix for mycon portrait (bug #183), from Nic
diff --git a/sc2/src/sc2code/libs/input/sdl/input.c b/sc2/src/sc2code/libs/input/sdl/input.c
index 52f71a2b3..7108ce9d4 100644
--- a/sc2/src/sc2code/libs/input/sdl/input.c
+++ b/sc2/src/sc2code/libs/input/sdl/input.c
@@ -114,6 +114,10 @@ ProcessKeyboardEvent(const SDL_Event *Event)
         UNICODE map_key;
 	if (!InputInitialized)
 		return;
+	if (!Event->key.keysym.unicode &&
+			(k == SDLK_CAPSLOCK ||
+			k == SDLK_NUMLOCK))
+		return;
 
 	if (Event->type == SDL_KEYDOWN)
 	{