diff --git a/src/m_cheat.c b/src/m_cheat.c
index 1c5f835cb..1c1b8c6aa 100644
--- a/src/m_cheat.c
+++ b/src/m_cheat.c
@@ -1165,23 +1165,17 @@ void OP_ObjectplaceMovement(player_t *player)
 	if (player->pflags & PF_ATTACKDOWN)
 	{
 		// Are ANY objectplace buttons pressed?  If no, remove flag.
-		if (!(cmd->buttons & (BT_ATTACK|BT_TOSSFLAG|BT_CAMRIGHT|BT_CAMLEFT)))
+		if (!(cmd->buttons & (BT_ATTACK|BT_TOSSFLAG)))
 			player->pflags &= ~PF_ATTACKDOWN;
 
 		// Do nothing.
 		return;
 	}
 
-	if (cmd->buttons & BT_CAMLEFT)
-	{
+	if (cmd->buttons & BT_WEAPONPREV)
 		OP_CycleThings(-1);
-		player->pflags |= PF_ATTACKDOWN;
-	}
-	else if (cmd->buttons & BT_CAMRIGHT)
-	{
+	else if (cmd->buttons & BT_WEAPONNEXT)
 		OP_CycleThings(1);
-		player->pflags |= PF_ATTACKDOWN;
-	}
 
 	// Place an object and add it to the maplist
 	if (cmd->buttons & BT_ATTACK)
@@ -1264,7 +1258,7 @@ void Command_ObjectPlace_f(void)
 			HU_DoCEcho(va(M_GetText(
 				"\\\\\\\\\\\\\\\\\\\\\\\\\x82"
 				"   Objectplace Controls:   \x80\\\\"
-				"Camera L/R: Cycle mapthings\\"
+				"Weapon L/R: Cycle mapthings\\"
 				"      Jump: Float up       \\"
 				"      Spin: Float down     \\"
 				" Fire Ring: Place object   \\")));