diff --git a/client/src/main/java/envoy/client/ui/listcell/AbstractListCell.java b/client/src/main/java/envoy/client/ui/listcell/AbstractListCell.java
index 0bbe20b..2a527fd 100644
--- a/client/src/main/java/envoy/client/ui/listcell/AbstractListCell.java
+++ b/client/src/main/java/envoy/client/ui/listcell/AbstractListCell.java
@@ -35,8 +35,10 @@ public abstract class AbstractListCell<T, U extends Node> extends ListCell<T> {
 	@Override
 	protected final void updateItem(T item, boolean empty) {
 		super.updateItem(item, empty);
-		setGraphic(empty || item == null ? null : renderItem(item));
-		if (!empty) setCursor(Cursor.HAND);
+		if (!(empty || item == null)) {
+			setCursor(Cursor.HAND);
+			setGraphic(renderItem(item));
+		}
 	}
 
 	/**