diff --git a/wg_stop b/wg_stop
index de19ed0..bc974ba 100755
--- a/wg_stop
+++ b/wg_stop
@@ -10,9 +10,10 @@
   if [ -z $active ]
       then
       yad --image-on-top --image=${wg_pic}wg-info.png \
-          --text="Es gibt keinen aktiven Tunnel den man stoppen könnte.\n" \
+          --text="There is no active tunnel that you could stop.\n" \
           --text-align=center --button="OK" --title "Wire-G" \
           --fixed --center --buttons-layout=center --borders=8 --center
+      exit 0
   fi
   #Damit wird der inhalt von /home/$a_user/.config/wg_nmcli/.tunnel.txt in ein Array gespeichert
   IFS=$'\n' lines=( $(cat ${wg_wdir}.tunnel.txt) ) 
diff --git a/wire_g b/wire_g
index 8eb28db..c6264d5 100755
--- a/wire_g
+++ b/wire_g
@@ -43,7 +43,7 @@ wg_notify(){
     #Icon des Menübuttons definieren
     echo "icon:${wg_pic}wg-vpn.png" >&3
     #Name des Menüs definieren
-    echo "tooltip:$active aktiv" >&3
+    echo "tooltip:$active activ" >&3
 
 }
 export -f wg_notify
@@ -66,11 +66,11 @@ import_wg(){
         then
             active=$(nmcli connection show --active | grep -iPo "(.*)(wireguard)" | sed 's/  .*//')
             if [ -n $active ]
-                then       
+                then  
+                    wg_stop   
                     nmcli connection import type wireguard file $wgconf > ${wg_wdir}.tmp.txt
                     wg_notify
             else
-                    wg_stop
                     nmcli connection import type wireguard file $wgconf > ${wg_wdir}.tmp.txt
                     wg_notify
             fi
@@ -181,13 +181,13 @@ selection=$(yad --no-click --list \
                 --column 'Selection' $tunnel)   
 if [ "$?" = "0" ]
     then 
-        active=$(nmcli connection show --active | grep -iPo "(.*)(wireguard)" | sed 's/  .*//')
+
         if [ -n $active ]
             then
+                wg_stop
                 nmcli connection up $selection &> ${wg_wdir}.tmp.txt
                 connect
         else
-                wg_stop
                 nmcli connection up $selection &> ${wg_wdir}.tmp.txt
                 connect
         fi