diff --git a/src/window/NotificationMatcherEdit.js b/src/window/NotificationMatcherEdit.js
index c6f0726..fb55e17 100644
--- a/src/window/NotificationMatcherEdit.js
+++ b/src/window/NotificationMatcherEdit.js
@@ -963,14 +963,23 @@ Ext.define('Proxmox.panel.NotificationMatchRuleSettings', {
 	},
 	{
 	    fieldLabel: gettext('Field'),
-	    xtype: 'textfield',
+	    xtype: 'proxmoxKVComboBox',
 	    isFormField: false,
 	    submitValue: false,
+	    allowBlank: false,
+	    editable: true,
+	    displayField: 'key',
 	    bind: {
 		hidden: '{!typeIsMatchField}',
 		disabled: '{!typeIsMatchField}',
 		value: '{matchFieldField}',
 	    },
+	    // TODO: Once we have a 'notification registry', we should
+	    // retrive those via an API call.
+	    comboItems: [
+		['type', ''],
+		['hostname', ''],
+	    ],
 	},
 	{
 	    fieldLabel: gettext('Value'),