diff --git a/driver.h b/driver.h
index 236fccce4c..0666597ba0 100644
--- a/driver.h
+++ b/driver.h
@@ -63,7 +63,8 @@ enum
    RARCH_SRAM_WRITE_PROTECT,
 #endif
 
-   RARCH_BIND_LIST_END
+   RARCH_BIND_LIST_END,
+   RARCH_BIND_LIST_END_NULL
 };
 
 struct snes_keybind
diff --git a/settings.c b/settings.c
index 3aa62808a4..84d352e028 100644
--- a/settings.c
+++ b/settings.c
@@ -525,7 +525,7 @@ struct bind_map
    }
 
 // Big and nasty bind map... :)
-static const struct bind_map bind_maps[MAX_PLAYERS][RARCH_BIND_LIST_END] = {
+static const struct bind_map bind_maps[MAX_PLAYERS][RARCH_BIND_LIST_END_NULL] = {
    {
       DECLARE_BIND(player1_b,             RETRO_DEVICE_ID_JOYPAD_B),
       DECLARE_BIND(player1_y,             RETRO_DEVICE_ID_JOYPAD_Y),