diff --git a/src/freedombone-addremove b/src/freedombone-addremove
index df4b621d53393b890da8e8807718c669e1788ee7..fe170b181da5d71274b3a7a6499553990faeaf98 100755
--- a/src/freedombone-addremove
+++ b/src/freedombone-addremove
@@ -133,8 +133,8 @@ function show_apps {
                 fi
             fi
             n=$((n+1))
+            app_index=$((app_index+1))
         fi
-        app_index=$((app_index+1))
     done
 
     # shellcheck disable=SC2086
@@ -174,8 +174,8 @@ function remove_apps_selected {
                     n=$((n+1))
                 fi
             fi
+            app_index=$((app_index+1))
         fi
-        app_index=$((app_index+1))
     done
 
     # if no apps to be removed then don't do anything
@@ -221,8 +221,8 @@ function install_apps_selected {
                     n=$((n+1))
                 fi
             fi
+            app_index=$((app_index+1))
         fi
-        app_index=$((app_index+1))
     done
 
     # if no apps to be installed then don't do anything