diff --git a/src/frontend/inventory.c b/src/frontend/inventory.c
index e5996dd9c..6c84476c6 100644
--- a/src/frontend/inventory.c
+++ b/src/frontend/inventory.c
@@ -40,9 +40,9 @@ com_inventory(wordlist *wl)
     devList = stat->STATdevNum;
 
     out_init();
-    out_send("Circuit Inventory\n\n");
+    out_send("\nCircuit Inventory\n\n");
     for (k = 0; k < ft_sim->numDevices; k++)
-        if (ft_sim->devices[k])
+        if (ft_sim->devices[k] && devList[k].instNum > 0)
             out_printf("%s: %d\n",
                        ft_sim->devices[k]->name,
                        devList[k].instNum);