diff --git a/src/main.c b/src/main.c
index 97df943..d236e56 100644
--- a/src/main.c
+++ b/src/main.c
@@ -730,7 +730,7 @@ static void
 run_camera_switch_action(GSimpleAction *action, GVariant *param, gpointer user_data)
 {
         int new_index = state.camera->index + 1;
-        if (new_index > state.configuration->count) {
+        if (new_index > state.configuration->count - 1 || new_index < 0) {
                 new_index = 0;
         }