diff --git a/src/forms/settings-dialog.cpp b/src/forms/settings-dialog.cpp
index 4397bcb8..d771efb7 100644
--- a/src/forms/settings-dialog.cpp
+++ b/src/forms/settings-dialog.cpp
@@ -816,6 +816,7 @@ void PluginWindow::tab_changed(const int tab) const
 		ui->cb_obs_output_action->setCurrentIndex(0);
 		ui->mapping_lbl_device_name->setText(ui->list_midi_dev->currentItem()->text());
 	}
+	Utils::build_hotkey_map();
 	clear_table();
 	load_table();
 	this->ui->table_mapping->resizeColumnsToContents();
diff --git a/src/utils.cpp b/src/utils.cpp
index 3c006fe3..a4c1f92d 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -926,7 +926,7 @@ QString Utils::translate_action(ActionsClass::Actions action)
 }
 void Utils::build_hotkey_map() {
 	hotkey_map.clear();
-
+	hotkey_name_map.clear();
 	obs_enum_hotkeys(
 		[](void *data, obs_hotkey_id id, obs_hotkey_t *hotkey) {
 			QString item(obs_hotkey_get_name(hotkey));