diff --git a/src/app/commands/cmd_remove_layer.cpp b/src/app/commands/cmd_remove_layer.cpp
index 28469c78f..3566262ce 100644
--- a/src/app/commands/cmd_remove_layer.cpp
+++ b/src/app/commands/cmd_remove_layer.cpp
@@ -56,7 +56,7 @@ bool RemoveLayerCommand::onEnabled(Context* context)
 {
   ContextWriter writer(context);
   Sprite* sprite(writer.sprite());
-  return sprite;
+  return (sprite != NULL);
 }
 
 void RemoveLayerCommand::onExecute(Context* context)