diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index 178b8682c..27c6d9608 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -305,7 +305,6 @@ if(ENABLE_UI)
     commands/cmd_set_palette.cpp
     commands/cmd_set_palette_entry_size.cpp
     commands/cmd_set_same_ink.cpp
-    commands/cmd_show.cpp
     commands/cmd_slice_properties.cpp
     commands/cmd_sprite_properties.cpp
     commands/cmd_swap_checkerboard_colors.cpp
@@ -580,6 +579,7 @@ add_library(app-lib
   commands/cmd_palette_size.cpp
   commands/cmd_remove_layer.cpp
   commands/cmd_save_file.cpp
+  commands/cmd_show.cpp
   commands/cmd_sprite_size.cpp
   commands/cmd_undo.cpp
   commands/command.cpp
diff --git a/src/app/commands/cmd_show.cpp b/src/app/commands/cmd_show.cpp
index 53e80152d..d2182c138 100644
--- a/src/app/commands/cmd_show.cpp
+++ b/src/app/commands/cmd_show.cpp
@@ -141,10 +141,12 @@ protected:
     DocumentPreferences& docPref = Preferences::instance().document(ctx->activeDocument());
     docPref.show.brushPreview(!docPref.show.brushPreview());
 
+#if ENABLE_UI
     // TODO we shouldn't need this, but it happens to be that the
     // Preview editor isn't being updated correctly when we change the
     // brush preview state.
     update_screen_for_document(ctx->activeDocument());
+#endif
   }
 };
 
diff --git a/src/app/commands/commands_list.h b/src/app/commands/commands_list.h
index c6a99c7ae..cd1cb78d4 100644
--- a/src/app/commands/commands_list.h
+++ b/src/app/commands/commands_list.h
@@ -48,6 +48,15 @@ FOR_EACH_COMMAND(ReplaceColor)
 FOR_EACH_COMMAND(SaveFile)
 FOR_EACH_COMMAND(SaveFileAs)
 FOR_EACH_COMMAND(SaveFileCopyAs)
+FOR_EACH_COMMAND(ShowAutoGuides)
+FOR_EACH_COMMAND(ShowBrushPreview)
+FOR_EACH_COMMAND(ShowExtras)
+FOR_EACH_COMMAND(ShowGrid)
+FOR_EACH_COMMAND(ShowLayerEdges)
+FOR_EACH_COMMAND(ShowPixelGrid)
+FOR_EACH_COMMAND(ShowSelectionEdges)
+FOR_EACH_COMMAND(ShowSlices)
+FOR_EACH_COMMAND(ShowTileNumbers)
 FOR_EACH_COMMAND(SpriteSize)
 FOR_EACH_COMMAND(Stroke)
 FOR_EACH_COMMAND(Undo)
@@ -148,17 +157,8 @@ FOR_EACH_COMMAND(SetPalette)
 FOR_EACH_COMMAND(SetPaletteEntrySize)
 FOR_EACH_COMMAND(SetPlaybackSpeed)
 FOR_EACH_COMMAND(SetSameInk)
-FOR_EACH_COMMAND(ShowAutoGuides)
-FOR_EACH_COMMAND(ShowBrushPreview)
-FOR_EACH_COMMAND(ShowExtras)
-FOR_EACH_COMMAND(ShowGrid)
-FOR_EACH_COMMAND(ShowLayerEdges)
 FOR_EACH_COMMAND(ShowMenu)
 FOR_EACH_COMMAND(ShowOnionSkin)
-FOR_EACH_COMMAND(ShowPixelGrid)
-FOR_EACH_COMMAND(ShowSelectionEdges)
-FOR_EACH_COMMAND(ShowSlices)
-FOR_EACH_COMMAND(ShowTileNumbers)
 FOR_EACH_COMMAND(SliceProperties)
 FOR_EACH_COMMAND(SnapToGrid)
 FOR_EACH_COMMAND(SpriteProperties)