diff --git a/meta/classes/devshell.bbclass b/meta/classes/devshell.bbclass
index 14f957e12b..35456b517b 100644
--- a/meta/classes/devshell.bbclass
+++ b/meta/classes/devshell.bbclass
@@ -2,9 +2,14 @@ EXTRA_OEMAKE[export] = "1"
 
 do_devshell[dirs] = "${S}"
 do_devshell[nostamp] = "1"
-do_devshell[interactive] = "1"
+
 devshell_do_devshell() {
-	bash -i
+	export TERMWINDOWTITLE="Bitbake Developer Shell"
+	${TERMCMD}
+	if [ $? -ne 0 ]; then
+	    echo "Fatal: '${TERMCMD}' not found. Check TERMCMD variable."
+	    exit 1
+	fi
 }
 addtask devshell after do_patch