diff --git a/src/g_shared/a_keys.cpp b/src/g_shared/a_keys.cpp
index b0f76e4b2..1169acb88 100644
--- a/src/g_shared/a_keys.cpp
+++ b/src/g_shared/a_keys.cpp
@@ -451,8 +451,12 @@ bool P_CheckKeys (AActor *owner, int keynum, bool remote)
 		{
 			if (failsound[i] != 0)
 			{
-				S_Sound (owner, CHAN_VOICE, failsound[i], 1, ATTN_NORM);
-				break;
+				int snd = S_FindSkinnedSound(owner, failsound[i]);
+				if (snd != 0)
+				{
+					S_Sound (owner, CHAN_VOICE, snd, 1, ATTN_NORM);
+					break;
+				}
 			}
 		}
 	}
diff --git a/src/menu/optionmenu.cpp b/src/menu/optionmenu.cpp
index cebaf9c83..ff13d4b24 100644
--- a/src/menu/optionmenu.cpp
+++ b/src/menu/optionmenu.cpp
@@ -146,9 +146,16 @@ bool DOptionMenu::Responder (event_t *ev)
 		{
 			if (CanScrollDown)
 			{
-				mDesc->mScrollPos += 2;
-				VisBottom += 2;
-				VisBottom++;
+				if (VisBottom < (int)(mDesc->mItems.Size()-2))
+				{
+					mDesc->mScrollPos += 2;
+					VisBottom += 2;
+				}
+				else
+				{
+					mDesc->mScrollPos++;
+					VisBottom++;
+				}
 			}
 			return true;
 		}