diff --git a/rpcs3/Gui/VFSManager.cpp b/rpcs3/Gui/VFSManager.cpp
index c9d3be671d..d1ba3365e4 100644
--- a/rpcs3/Gui/VFSManager.cpp
+++ b/rpcs3/Gui/VFSManager.cpp
@@ -120,8 +120,14 @@ VFSManagerDialog::VFSManagerDialog(wxWindow* parent)
 {
 	m_list = new wxListView(this);
 
+	wxBoxSizer* s_btns = new wxBoxSizer(wxHORIZONTAL);
+	s_btns->Add(new wxButton(this, wxID_OK));
+	s_btns->AddSpacer(30);
+	s_btns->Add(new wxButton(this, wxID_CANCEL));
+
 	wxBoxSizer* s_main = new wxBoxSizer(wxVERTICAL);
 	s_main->Add(m_list, 1, wxEXPAND);
+       s_main->Add(s_btns,  0, wxALL | wxCENTER, 10);
 
 	SetSizerAndFit(s_main);
 	SetSize(800, 600);
@@ -136,7 +142,7 @@ VFSManagerDialog::VFSManagerDialog(wxWindow* parent)
 	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);
+	Bind(wxEVT_CLOSE_WINDOW, &VFSManagerDialog::OnClose, this, wxID_OK);
 
 	LoadEntries();
 	UpdateList();
diff --git a/rpcs3/Gui/VHDDManager.cpp b/rpcs3/Gui/VHDDManager.cpp
index 5bf185f04d..27b4327ec1 100644
--- a/rpcs3/Gui/VHDDManager.cpp
+++ b/rpcs3/Gui/VHDDManager.cpp
@@ -383,8 +383,14 @@ VHDDManagerDialog::VHDDManagerDialog(wxWindow* parent)
 {
 	m_list = new wxListView(this);
 
+	wxBoxSizer* s_btns = new wxBoxSizer(wxHORIZONTAL);
+	s_btns->Add(new wxButton(this, wxID_OK));
+	s_btns->AddSpacer(30);
+	s_btns->Add(new wxButton(this, wxID_CANCEL));
+
 	wxBoxSizer* s_main = new wxBoxSizer(wxVERTICAL);
 	s_main->Add(m_list, 1, wxEXPAND | wxALL, 5);
+       s_main->Add(s_btns,  0, wxALL | wxCENTER, 10);
 
 	SetSizerAndFit(s_main);
 	SetSize(800, 600);
@@ -400,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);
+	Bind(wxEVT_CLOSE_WINDOW, &VHDDManagerDialog::OnClose, this, wxID_OK);
 	LoadPaths();
 	UpdateList();
 }