diff --git a/source/glest_game/gui/gui.cpp b/source/glest_game/gui/gui.cpp
index 1f9c80b3..8bfae43e 100644
--- a/source/glest_game/gui/gui.cpp
+++ b/source/glest_game/gui/gui.cpp
@@ -718,7 +718,7 @@ void Gui::mouseDownDisplayUnitSkills(int posDisplay) {
 						ct = selection.getUnitFromCC(ccAttack)->getType()->getFirstCtOfClass(activeCommandClass);
 					}
 					auto mct= unit->getCurrMorphCt();
-					if(mct) ct= mct->getMorphUnit()->getFirstCtOfClass(activeCommandClass);
+					if(mct && isKeyDown(queueCommandKey)) ct= mct->getMorphUnit()->getFirstCtOfClass(activeCommandClass);
 
 					if(activeCommandType!=NULL && activeCommandType->getClass()==ccBuild){
 						assert(selection.isUniform());