diff --git a/src/add-ons/input_server/filters/shortcut_catcher/CommandActuators.cpp b/src/add-ons/input_server/filters/shortcut_catcher/CommandActuators.cpp
index af53a9d314..6f72dfcf29 100644
--- a/src/add-ons/input_server/filters/shortcut_catcher/CommandActuators.cpp
+++ b/src/add-ons/input_server/filters/shortcut_catcher/CommandActuators.cpp
@@ -797,6 +797,8 @@ KeyStrokeSequenceCommandActuator::_GenerateKeyCodes()
 			_SetStateBit(states, overrideKey);
 		}
 	}
+	free(keys);
+	free(map);
 }
 
 
diff --git a/src/add-ons/input_server/filters/shortcut_catcher/KeyInfos.cpp b/src/add-ons/input_server/filters/shortcut_catcher/KeyInfos.cpp
index ab20c61391..5174b4fb59 100644
--- a/src/add-ons/input_server/filters/shortcut_catcher/KeyInfos.cpp
+++ b/src/add-ons/input_server/filters/shortcut_catcher/KeyInfos.cpp
@@ -11,6 +11,7 @@
 
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 
@@ -102,7 +103,7 @@ static const char*
 FindSpecialKeyLabelFor(uint8 keyCode, int& last)
 {
 	while ((keyLabels[last].fKeyCode < keyCode) 
-		&& (last < (sizeof(keyLabels)/sizeof(struct KeyLabelMap))-1)) 
+		&& (last < (sizeof(keyLabels) / sizeof(struct KeyLabelMap)) - 1)) 
 		last++;
 
 	if (keyLabels[last].fKeyCode == keyCode)
@@ -151,6 +152,8 @@ InitKeyIndices()
 		} else
 			utfDescriptions[j * MAX_UTF8_LENGTH] = 0x00;
 	}
+	free(keys);
+	free(map);
 }