diff --git a/meta/classes/devshell.bbclass b/meta/classes/devshell.bbclass
index 4fb3e63d21..5f262f426e 100644
--- a/meta/classes/devshell.bbclass
+++ b/meta/classes/devshell.bbclass
@@ -9,7 +9,8 @@ devshell_do_devshell() {
 	export XAUTHORITY='${XAUTHORITY}'
 	export TERMWINDOWTITLE="Bitbake Developer Shell"
 	export EXTRA_OEMAKE='${EXTRA_OEMAKE}'
-	${TERMCMD}
+	export SHELLCMDS="bash"
+	${TERMCMDRUN}
 	if [ $? -ne 0 ]; then
 	    echo "Fatal: '${TERMCMD}' not found. Check TERMCMD variable."
 	    exit 1
@@ -17,6 +18,5 @@ devshell_do_devshell() {
 }
 addtask devshell after do_patch
 
-
 EXPORT_FUNCTIONS do_devshell
 
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index a1b1354788..5d9b86a819 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -202,7 +202,7 @@ do_menuconfig() {
         export DBUS_SESSION_BUS_ADDRESS='${DBUS_SESSION_BUS_ADDRESS}'
         export XAUTHORITY='${XAUTHORITY}'
 	export TERMWINDOWTITLE="${PN} Kernel Configuration"
-	export SHELLCMDS="make menuconfig"
+	export SHELLCMDS="bash make menuconfig"
 	${TERMCMDRUN}
 	if [ $? -ne 0 ]; then
 		echo "Fatal: '${TERMCMD}' not found. Check TERMCMD variable."