diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index 13ed2562..5835f6f9 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -4942,10 +4942,19 @@ portwine_create_shortcut () {
 
         if [[ "$PW_NO_RESTART_PPDB" != "1" ]] ; then
             print_info "Restarting PP..."
-            unset PW_YAD_FORM_TAB
+            if [[ "${PW_GUI_START}" == "NOTEBOOK" ]] ; then
+                unset PW_YAD_FORM_TAB
+            fi
             /usr/bin/env bash -c ${pw_full_command_line[*]} &
             exit 0
         fi
+    elif [[ "$PW_YAD_OUT" == "2" ]] ; then
+        print_info "Restarting PP..."
+        if [[ "${PW_GUI_START}" == "NOTEBOOK" ]] ; then
+            unset PW_YAD_FORM_TAB
+        fi
+        /usr/bin/env bash -c ${pw_full_command_line[*]} &
+        exit 0
     fi
 }
 
diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh
index bce360e8..b206ccb7 100755
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -601,7 +601,7 @@ if [[ -f "${portwine_exe}" ]] ; then
             2>/dev/null &
 
             if [[ "${PW_YAD_FORM_TAB}" == "1" ]] \
-            && [[ ! -z "${TAB_START}" ]]
+            && [[ -n "${TAB_START}" ]]
             then
                 export TAB_START="2"
                 unset PW_YAD_FORM_TAB
@@ -655,7 +655,7 @@ if [[ -f "${portwine_exe}" ]] ; then
             --button="$(gettext "LAUNCH")"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"$(gettext "Run file ...")":106 2>/dev/null
             PW_YAD_SET="$?"
         fi
-        [[ ! -z "$PW_YAD_SET" ]] && case "$PW_YAD_SET" in
+        [[ -n "$PW_YAD_SET" ]] && case "$PW_YAD_SET" in
             128)
                     if [[ "${PW_GUI_START}" == "NOTEBOOK" ]] ; then
                         unset PW_YAD_FORM_TAB