diff --git a/source/glest_game/gui/gui.cpp b/source/glest_game/gui/gui.cpp
index 8bfae43e..d46d2ed2 100644
--- a/source/glest_game/gui/gui.cpp
+++ b/source/glest_game/gui/gui.cpp
@@ -1006,7 +1006,7 @@ void Gui::computeDisplay(){
 							display.setCommandType(displayPos, ct);
 							display.setCommandClass(displayPos, ct->getClass());
 							bool reqOk=u->getFaction()->reqsOk(ct);
-							display.setDownLighted(displayPos, reqOk && !(!ct->isQueueAppendable() && isKeyDown(queueCommandKey)));
+							display.setDownLighted(displayPos, reqOk && !(ct->isQueuable()==qNever && isKeyDown(queueCommandKey)));
 
 							if (reqOk && produced != NULL) {
 								if (possibleAmount == 0) {
diff --git a/source/glest_game/types/command_type.h b/source/glest_game/types/command_type.h
index 42dd6f01..fa5c0383 100644
--- a/source/glest_game/types/command_type.h
+++ b/source/glest_game/types/command_type.h
@@ -425,7 +425,7 @@ public:
 	virtual string toString(bool translatedValue) const;
 	virtual string getReqDesc(bool translatedValue) const;
 	virtual const ProducibleType *getProduced() const;
-	Queueability isQueuable() const						{return qAlways;} //After morph anything can happen
+	Queueability isQueuable() const						{return qOnRequest;}
 
     //get
 	const MorphSkillType *getMorphSkillType() const		{return morphSkillType;}