diff --git a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/songsearch.lua b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/songsearch.lua
index 77771c02bf..c0869e4883 100644
--- a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/songsearch.lua	
+++ b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/songsearch.lua	
@@ -29,7 +29,7 @@ local function searchInput(event)
 			searchstring = searchstring..HOOKS:GetClipboard()
 		else
 			--if not nil and (not a number or (ctrl pressed and not online))
-			local CtrlPressed = INPUTFILTER:IsBeingPressed("left ctrl", nil) or INPUTFILTER:IsBeingPressed("right ctrl", nil)
+			local CtrlPressed = INPUTFILTER:IsBeingPressed("left ctrl") or INPUTFILTER:IsBeingPressed("right ctrl")
 			if event.char and event.char:match("[%%%+%-%!%@%#%$%^%&%*%(%)%=%_%.%,%:%;%'%\"%>%<%?%/%~%|%w]") and (not tonumber(event.char) or CtrlPressed == (SCREENMAN:GetTopScreen():GetName() == "ScreenSelectMusic")) then
 				searchstring = searchstring..event.char
 			end
diff --git a/src/InputFilter.cpp b/src/InputFilter.cpp
index 2241e7ed7a..f7442abac9 100644
--- a/src/InputFilter.cpp
+++ b/src/InputFilter.cpp
@@ -517,7 +517,10 @@ class LunaInputFilter: public Luna<InputFilter>
 			return luaL_error(L, "IsBeingPressed(button, inputDevice=keyboard) expects at least one parameter");
 		}
 		DeviceButton button = StringToDeviceButton(SArg(1));
-		InputDevice device = lua_isnil(L, 2) ? DEVICE_KEYBOARD : StringToInputDevice(SArg(2));
+		InputDevice device = DEVICE_KEYBOARD;
+		if( !(lua_isnil(L, 2)) && lua_gettop(L) > 1) {
+			device = StringToInputDevice(SArg(2));
+		}
 		lua_pushboolean(L, INPUTFILTER->IsBeingPressed(DeviceInput(device, button)));
 		return 1;
 	}