diff --git a/src/main/kotlin/com/marvinelsen/willow/ui/cells/EntryCellFactory.kt b/src/main/kotlin/com/marvinelsen/willow/ui/cells/EntryCellFactory.kt
index 0513a6a..6ead1d8 100644
--- a/src/main/kotlin/com/marvinelsen/willow/ui/cells/EntryCellFactory.kt
+++ b/src/main/kotlin/com/marvinelsen/willow/ui/cells/EntryCellFactory.kt
@@ -44,15 +44,13 @@ internal class EntryCell : ListCell<DictionaryEntryFx?>() {
 
     init {
         text = null
-        if (item != null) {
-            contextMenu = createContextMenuForEntry(item!!)
-        }
     }
 
     override fun updateItem(entry: DictionaryEntryFx?, empty: Boolean) {
         super.updateItem(entry, empty)
         if (empty || entry == null) {
             graphic = null
+            contextMenu = null
         } else {
             labelHeadword.text = entry.traditionalProperty.value
             labelPronunciation.text = entry.pinyinWithToneMarksProperty.value
@@ -60,6 +58,7 @@ internal class EntryCell : ListCell<DictionaryEntryFx?>() {
             val definition = entry.definitions.joinToString(separator = " / ") { it.joinToString(separator = "; ") }
             labelDefinition.text = definition
 
+            contextMenu = createContextMenuForEntry(entry)
             graphic = root
         }
     }