diff --git a/Src/Merge.rc b/Src/Merge.rc
index 76ba6b8ca56..d6f72a3a0c7 100644
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -2351,8 +2351,8 @@ CAPTION "Plugins"
 FONT 8, FONTNAME, 0, 0, 0x1
 BEGIN
     CONTROL         "&Enable plugins",IDC_PLUGINS_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,266,10
-    LTEXT           "Plugin &type:",IDC_STATIC,7,19,70,10
-    COMBOBOX        IDC_PLUGIN_TYPE,80,19,205,14,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Plugin &type:",IDC_STATIC,7,21,70,10
+    COMBOBOX        IDC_PLUGIN_TYPE,80,19,205,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     CONTROL         "",IDC_PLUGINSLIST_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,38,456,139
     LTEXT           "File filters:",IDC_STATIC,7,183,70,10
     COMBOBOX        IDC_PLUGIN_FILEFILTERS,80,183,305,14,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
diff --git a/Src/PluginsListDlg.cpp b/Src/PluginsListDlg.cpp
index 88d4c6bde51..4bf0e3a0225 100644
--- a/Src/PluginsListDlg.cpp
+++ b/Src/PluginsListDlg.cpp
@@ -79,6 +79,8 @@ BOOL PluginsListDlg::OnInitDialog()
 
 	
 	InitList();
+	SetDlgItemComboBoxList(IDC_PLUGIN_TYPE, { _("Unpacker"), _("Prediffer"), _("Editor script") });
+	m_comboType.SetCurSel(0);
 	SetPlugins(0);
 	m_list.SetItemState(0, LVIS_SELECTED, LVIS_SELECTED);
 
@@ -210,7 +212,10 @@ void PluginsListDlg::AddPlugin(unsigned id)
 			return;
 		String errmsg;
 		if (internal_plugin::AddPlugin(*info, errmsg))
+		{
+			m_comboType.SetCurSel(id == ID_PLUGIN_ADD_UNPACKER ? 0 : 1);
 			break;
+		}
 		AfxMessageBox(errmsg.c_str(), MB_OK | MB_ICONEXCLAMATION);
 	}
 	RefreshList();
@@ -422,6 +427,7 @@ void PluginsListDlg::OnLVNItemChanged(NMHDR *pNMHDR, LRESULT *pResult)
  */
 void PluginsListDlg::OnSelchangePluginType()
 {
+	SetPlugins(m_comboType.GetCurSel());
 }
 
 /**
diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po
index 065343ea723..e82853ea42a 100644
--- a/Translations/WinMerge/Japanese.po
+++ b/Translations/WinMerge/Japanese.po
@@ -2070,7 +2070,7 @@ msgid "&Enable plugins"
 msgstr "プラグインを有効にする(&E)"
 
 msgid "Plugin &type:"
-msgstr "プラグインの種類(&T)"
+msgstr "プラグインの種類(&T):"
 
 msgid "File filters:"
 msgstr "ファイル フィルター:"