diff --git a/app/src/main/java/helium314/keyboard/latin/utils/ToolbarUtils.kt b/app/src/main/java/helium314/keyboard/latin/utils/ToolbarUtils.kt
index dc5a78c65..6cb94ff79 100644
--- a/app/src/main/java/helium314/keyboard/latin/utils/ToolbarUtils.kt
+++ b/app/src/main/java/helium314/keyboard/latin/utils/ToolbarUtils.kt
@@ -199,11 +199,21 @@ fun toolbarKeysCustomizer(context: Context) {
         orientation = LinearLayout.VERTICAL
         setPadding(3 * padding, padding, padding, padding)
     }
-    val dialog = AlertDialog.Builder(context)
+    val builder = AlertDialog.Builder(context)
         .setTitle(R.string.customize_toolbar_key_codes)
         .setView(ScrollView(context).apply { addView(ll) })
         .setPositiveButton(R.string.dialog_close, null)
-        .create()
+    val prefs = DeviceProtectedUtils.getSharedPreferences(context)
+    if (readCustomKeyCodes(prefs).isNotEmpty() || readCustomLongpressCodes(prefs).isNotEmpty())
+        builder.setNeutralButton(R.string.button_default) { _, _ ->
+            confirmDialog(context, context.getString(R.string.customize_toolbar_key_code_reset_message), context.getString(android.R.string.ok)) {
+                prefs.edit {
+                    remove(Settings.PREF_TOOLBAR_CUSTOM_KEY_CODES)
+                    remove(Settings.PREF_TOOLBAR_CUSTOM_LONGPRESS_CODES)
+                }
+            }
+        }
+    val dialog = builder.create()
     val cf = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(ContextCompat.getColor(context, R.color.foreground), BlendModeCompat.SRC_IN)
     ToolbarKey.entries.forEach { key ->
         val binding = ReorderDialogItemBinding.inflate(LayoutInflater.from(context), ll, true)
@@ -278,13 +288,13 @@ private fun toolbarKeyCustomizer(context: Context, key: ToolbarKey) {
 }
 
 fun readCustomKeyCodes(prefs: SharedPreferences) = prefs.getString(Settings.PREF_TOOLBAR_CUSTOM_KEY_CODES, "")!!
-        .split(";").associate {
+        .split(";").filter { it.isNotEmpty()}.associate {
             val code = runCatching { it.substringAfter(",").toIntOrNull()?.checkAndConvertCode() }.getOrNull()
             it.substringBefore(",") to code
         }
 
 fun readCustomLongpressCodes(prefs: SharedPreferences) = prefs.getString(Settings.PREF_TOOLBAR_CUSTOM_LONGPRESS_CODES, "")!!
-    .split(";").associate {
+    .split(";").filter { it.isNotEmpty()}.associate {
         val code = runCatching { it.substringAfter(",").toIntOrNull()?.checkAndConvertCode() }.getOrNull()
         it.substringBefore(",") to code
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b4dc0c057..322cadd77 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -948,6 +948,8 @@ New dictionary:
     <string name="var_toolbar_direction_summary">Reverse direction when a right-to-left keyboard subtype is selected</string>
     <!-- Title of the setting to customize toolbar key codes -->
     <string name="customize_toolbar_key_codes">Customize toolbar key codes</string>
+    <!-- Confirmation message when resetting all custom toolbar key codes -->
+    <string name="customize_toolbar_key_code_reset_message">Really clear all customized key codes?</string>
     <!-- Text for showing / setting key code -->
     <string name="key_code">Key code</string>
     <!-- Text for showing / setting long press code -->