diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index 955bbaee..78858fcd 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -1007,6 +1007,7 @@ init_wine_ver () {
 }
 
 pw_init_runtime () {
+    check_flatpak && export PW_USE_RUNTIME="0"
     if [[ "$PW_USE_RUNTIME" != "1" ]] \
     || [[ "$PW_WINE_USE" == "USE_SYSTEM_WINE" ]]
     then
diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh
index 7ea1881e..79f7b59a 100755
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -284,7 +284,6 @@ fi
 
 if check_flatpak ; then
     try_remove_dir "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}"
-    export PW_USE_RUNTIME="0"
 else pw_download_libs
 fi
 
@@ -830,6 +829,14 @@ fi
         else
             export TAB_MAIN_MENU="4"
         fi
+        ;;
+    pw_find_exe)
+        if [[ -z "${PW_ALL_DF}" ]] ; then
+            export TAB_MAIN_MENU="5"
+        else
+            export TAB_MAIN_MENU="1"
+        fi
+        ;;
 esac
 
 [[ -n "$PW_YAD_SET" ]] && case "$PW_YAD_SET" in