diff --git a/app/src/main/java/om/sstvencoder/TextOverlay/LabelCollection.java b/app/src/main/java/om/sstvencoder/TextOverlay/LabelCollection.java
index 3fd9a71..c717f85 100644
--- a/app/src/main/java/om/sstvencoder/TextOverlay/LabelCollection.java
+++ b/app/src/main/java/om/sstvencoder/TextOverlay/LabelCollection.java
@@ -115,7 +115,7 @@ public class LabelCollection {
     }
 
     public void editLabelEnd(Label label) {
-        if (label != null) { // not canceled
+        if (mEditLabel != null && label != null) {
             if ("".equals(label.getText().trim())) {
                 if (mLabels.contains(mEditLabel))
                     mLabels.remove(mEditLabel);