diff --git a/nft-edit-ruleset b/nft-edit-ruleset
index 94295f5..32fa7f7 100755
--- a/nft-edit-ruleset
+++ b/nft-edit-ruleset
@@ -138,13 +138,13 @@ while true ; do
         read -p "Errors when applying changes (Ctrl-c to abort, ENTER to continue editing)" -r answer
       fi
     else
+      if "$timeout" ; then
         set_timeout "$tmp_old" "$timeout_secs"
       fi
 
       echo "Changes applied successfully."
 
-      if "$timeout" ; then
-      exit 0
+      break
     fi
   fi
 done