diff --git a/rpcs3/Gui/VFSManager.cpp b/rpcs3/Gui/VFSManager.cpp
index d1ba3365e4..9df763384f 100644
--- a/rpcs3/Gui/VFSManager.cpp
+++ b/rpcs3/Gui/VFSManager.cpp
@@ -139,10 +139,10 @@ VFSManagerDialog::VFSManagerDialog(wxWindow* parent)
 
 	m_list->Bind(wxEVT_LIST_ITEM_ACTIVATED, &VFSManagerDialog::OnEntryConfig, this);
 	m_list->Bind(wxEVT_RIGHT_DOWN, &VFSManagerDialog::OnRightClick, this);
-	Bind(wxEVT_MENU,         &VFSManagerDialog::OnAdd, this, id_add);
-	Bind(wxEVT_MENU,         &VFSManagerDialog::OnRemove, this, id_remove);
-	Bind(wxEVT_MENU,         &VFSManagerDialog::OnEntryConfig, this, id_config);
-	Bind(wxEVT_CLOSE_WINDOW, &VFSManagerDialog::OnClose, this, wxID_OK);
+	Bind(wxEVT_MENU,   &VFSManagerDialog::OnAdd, this, id_add);
+	Bind(wxEVT_MENU,   &VFSManagerDialog::OnRemove, this, id_remove);
+	Bind(wxEVT_MENU,   &VFSManagerDialog::OnEntryConfig, this, id_config);
+	Bind(wxEVT_BUTTON, &VFSManagerDialog::OnOK, this, wxID_OK);
 
 	LoadEntries();
 	UpdateList();
@@ -214,7 +214,7 @@ void VFSManagerDialog::OnRemove(wxCommandEvent& event)
 	UpdateList();
 }
 
-void VFSManagerDialog::OnClose(wxCloseEvent& event)
+void VFSManagerDialog::OnOK(wxCommandEvent& event)
 {
 	SaveEntries();
 	event.Skip();
diff --git a/rpcs3/Gui/VFSManager.h b/rpcs3/Gui/VFSManager.h
index 309f9882e1..63260b3e6c 100644
--- a/rpcs3/Gui/VFSManager.h
+++ b/rpcs3/Gui/VFSManager.h
@@ -33,7 +33,7 @@ public:
 	void OnAdd(wxCommandEvent& event);
 	void OnRemove(wxCommandEvent& event);
 
-	void OnClose(wxCloseEvent& event);
+	void OnOK(wxCommandEvent& event);
 	void LoadEntries();
 	void SaveEntries();
-};
\ No newline at end of file
+};
diff --git a/rpcs3/Gui/VHDDManager.cpp b/rpcs3/Gui/VHDDManager.cpp
index 27b4327ec1..5808848259 100644
--- a/rpcs3/Gui/VHDDManager.cpp
+++ b/rpcs3/Gui/VHDDManager.cpp
@@ -406,7 +406,7 @@ VHDDManagerDialog::VHDDManagerDialog(wxWindow* parent)
 	Bind(wxEVT_MENU, &VHDDManagerDialog::OnOpen, this, id_open);
 	Bind(wxEVT_MENU, &VHDDManagerDialog::OnRemove, this, id_remove);
 	Bind(wxEVT_MENU, &VHDDManagerDialog::OnCreateHDD, this, id_create_hdd);
-	Bind(wxEVT_CLOSE_WINDOW, &VHDDManagerDialog::OnClose, this, wxID_OK);
+	Bind(wxEVT_BUTTON, &VHDDManagerDialog::OnOk, this, wxID_OK);
 	LoadPaths();
 	UpdateList();
 }
@@ -521,7 +521,7 @@ void VHDDManagerDialog::OnCreateHDD(wxCommandEvent& event)
 	}
 }
 
-void VHDDManagerDialog::OnClose(wxCloseEvent& event)
+void VHDDManagerDialog::OnOk(wxCommandEvent& event)
 {
 	SavePaths();
 	event.Skip();
diff --git a/rpcs3/Gui/VHDDManager.h b/rpcs3/Gui/VHDDManager.h
index aec9f55fc4..b3b8ad9a49 100644
--- a/rpcs3/Gui/VHDDManager.h
+++ b/rpcs3/Gui/VHDDManager.h
@@ -82,7 +82,7 @@ public:
 	void OnRemove(wxCommandEvent& event);
 	void OnCreateHDD(wxCommandEvent& event);
 
-	void OnClose(wxCloseEvent& event);
+	void OnOk(wxCommandEvent& event);
 	void LoadPaths();
 	void SavePaths();
 };