diff --git a/src/win32/MainWnd.cpp b/src/win32/MainWnd.cpp
index 0d32bc47..218e7cf3 100644
--- a/src/win32/MainWnd.cpp
+++ b/src/win32/MainWnd.cpp
@@ -389,8 +389,8 @@ BEGIN_MESSAGE_MAP(MainWnd, CWnd)
   ON_COMMAND_EX_RANGE(ID_OPTIONS_FILTER_BILINEAR, ID_OPTIONS_FILTER_BILINEARPLUS, OnOptionsFilter)
   ON_COMMAND_EX_RANGE(ID_OPTIONS_FILTER_SCANLINES, ID_OPTIONS_FILTER_SCANLINES, OnOptionsFilter)
   ON_COMMAND_EX_RANGE(ID_OPTIONS_FILTER_HQ2X, ID_OPTIONS_FILTER_LQ2X, OnOptionsFilter)
-  ON_COMMAND_EX_RANGE(ID_OPTIONS_FILTER_PLUGIN, ID_OPTIONS_FILTER_PLUGIN, OnOptionsFilter)
-  ON_UPDATE_COMMAND_UI_RANGE(ID_OPTIONS_FILTER_PLUGIN, ID_OPTIONS_FILTER_PLUGIN, OnUpdateOptionsFilter)
+  ON_COMMAND_EX(ID_OPTIONS_FILTER_PLUGIN, OnOptionsFilter)
+  ON_UPDATE_COMMAND_UI(ID_OPTIONS_FILTER_PLUGIN, OnUpdateOptionsFilter)
   ON_COMMAND_EX(ID_OPTIONS_FILTER_HQ3X, OnOptionsFilter)
   ON_COMMAND_EX(ID_OPTIONS_FILTER_HQ4X, OnOptionsFilter)
   ON_COMMAND_EX(ID_OPTIONS_FILTER_SIMPLE3X, OnOptionsFilter)
diff --git a/src/win32/MainWndOptions.cpp b/src/win32/MainWndOptions.cpp
index 0b240686..9fdef6ea 100644
--- a/src/win32/MainWndOptions.cpp
+++ b/src/win32/MainWndOptions.cpp
@@ -1286,9 +1286,13 @@ BOOL MainWnd::OnOptionsFilter(UINT nID)
 	case ID_OPTIONS_FILTER_TVMODE:
 		theApp.filterType = FILTER_TVMODE;
 		break;
-case ID_OPTIONS_FILTER_PLUGIN:
-    theApp.filterType = FILTER_PLUGIN;
-    break;
+	case ID_OPTIONS_FILTER_PLUGIN:
+		theApp.filterType = FILTER_PLUGIN;
+		if( strcmp( theApp.pluginName, "" ) == 0 ) {
+			// open select plugin dialog when none selected
+			OnOptionsSelectPlugin();
+		}
+		break;
 	case ID_OPTIONS_FILTER_2XSAI:
 		theApp.filterType = FILTER_2XSAI;
 		break;
@@ -1359,8 +1363,8 @@ void MainWnd::OnUpdateOptionsFilter(CCmdUI *pCmdUI)
     pCmdUI->SetCheck(theApp.filterType == FILTER_SUPER2XSAI);
     break;
   case ID_OPTIONS_FILTER_PLUGIN:
-  pCmdUI->SetCheck(theApp.filterType == FILTER_PLUGIN);
-  break;
+    pCmdUI->SetCheck(theApp.filterType == FILTER_PLUGIN);
+    break;
   case ID_OPTIONS_FILTER_SUPEREAGLE:
     pCmdUI->SetCheck(theApp.filterType == FILTER_SUPEREAGLE);
     break;
@@ -1720,8 +1724,9 @@ void MainWnd::OnOptionsSelectPlugin()
 {
   SelectPlugin dlg;
 
-  if (dlg.DoModal() == IDOK && theApp.filterType == FILTER_PLUGIN)
+  if (dlg.DoModal() == IDOK)
   {
+	theApp.filterType = FILTER_PLUGIN;
 	theApp.updateFilter();
   }
 }
diff --git a/src/win32/VBA.cpp b/src/win32/VBA.cpp
index f8540506..4c5061e4 100644
--- a/src/win32/VBA.cpp
+++ b/src/win32/VBA.cpp
@@ -1446,7 +1446,7 @@ void VBA::loadSettings()
 
   videoOption = regQueryDwordValue("video", VIDEO_3X);
 
-  strcpy(pluginName, regQueryStringValue("pluginName", "Scale2x.rpi"));
+  strcpy(pluginName, regQueryStringValue("pluginName", ""));
 
   if(videoOption < VIDEO_1X || videoOption > VIDEO_OTHER)
     videoOption = VIDEO_3X;