diff --git a/UI/ControlMappingScreen.cpp b/UI/ControlMappingScreen.cpp
index 4113e0dad1..1a4e137d87 100644
--- a/UI/ControlMappingScreen.cpp
+++ b/UI/ControlMappingScreen.cpp
@@ -416,7 +416,7 @@ void JoystickHistoryView::Draw(UIContext &dc) {
 
 void JoystickHistoryView::Update(const InputState &input_state) {
 	locations_.push_back(Location(curX_, curY_));
-	if (locations_.size() > maxCount_) {
+	if ((int)locations_.size() > maxCount_) {
 		locations_.pop_front();
 	}
 }