diff --git a/src/LibCecTray/controller/applications/ApplicationInput.cs b/src/LibCecTray/controller/applications/ApplicationInput.cs
index c124ab0..2f1565a 100644
--- a/src/LibCecTray/controller/applications/ApplicationInput.cs
+++ b/src/LibCecTray/controller/applications/ApplicationInput.cs
@@ -436,6 +436,12 @@ public ApplicationInput AddAction(ActionType action)
       return this;
     }
 
+    public ApplicationInput Clear()
+    {
+      _input.Clear();
+      return this;
+    }
+
     private readonly List<ApplicationAction> _input = new List<ApplicationAction>();
   }
 }
diff --git a/src/LibCecTray/controller/applications/CecButtonConfigUI.cs b/src/LibCecTray/controller/applications/CecButtonConfigUI.cs
index 9f2cdee..94c7ed3 100644
--- a/src/LibCecTray/controller/applications/CecButtonConfigUI.cs
+++ b/src/LibCecTray/controller/applications/CecButtonConfigUI.cs
@@ -112,7 +112,7 @@ private void BDefaultClick(object sender, EventArgs e)
 
     private void BClearClick(object sender, EventArgs e)
     {
-      _button.Value = null;
+      _button.Value = _button.Value.Clear();
     }
 
     private void BAddKeyClick(object sender, EventArgs e)