diff --git a/src/freedombone-utils-selector b/src/freedombone-utils-selector
index 01eead40bc5f321cf3a3b884aa06e9f7f0e89998..a25f719e6f8f13b4a2e64332807ac99e6911051c 100755
--- a/src/freedombone-utils-selector
+++ b/src/freedombone-utils-selector
@@ -59,13 +59,9 @@ function item_in_array {
 
 function app_is_installed {
     app_name="$1"
-    if [ ! -f $COMPLETION_FILE ]; then
-        echo "0"
-        return
-    fi
-
-    if [ -f /usr/share/${PROJECT_NAME}/installed.txt ]; then
-        if ! grep -Fxq "install_${app_name}" /usr/share/${PROJECT_NAME}/installed.txt; then
+    INSTALLED_APPS_LIST=/usr/share/${PROJECT_NAME}/installed.txt
+    if [ -f $INSTALLED_APPS_LIST ]; then
+        if ! grep -Fxq "install_${app_name}" $INSTALLED_APPS_LIST; then
             echo "0"
         else
             echo "1"
@@ -73,6 +69,11 @@ function app_is_installed {
         return
     fi
 
+    if [ ! -f $COMPLETION_FILE ]; then
+        echo "0"
+        return
+    fi
+
     if ! grep -Fxq "install_${app_name}" $COMPLETION_FILE; then
         echo "0"
     else