diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index 7907b574c1..792fb7210c 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -37,7 +37,7 @@ function webserverKillAll()
 			kill -SIGTERM -$(< ${pidfile}) 2>/dev/null
 			sleep 1;
 			# Kill processes if they are still running - may happen in interactive shells
-			ps fux | grep "python.*manage.py runserver" | awk '{print $2}' | xargs kill
+			pkill -U $UID -f "python.*manage.py runserver"
 		done;
 		rm  ${pidfile}
 		fi