diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt
index f2d4f86431..29e9c57741 100644
--- a/pcsx2/CMakeLists.txt
+++ b/pcsx2/CMakeLists.txt
@@ -366,6 +366,7 @@ set(pcsx2GuiHeaders
 	gui/IniInterface.h
 	gui/IsoDropTarget.h
 	gui/MainFrame.h
+	gui/MemoryCardFile.h
 	gui/MSWstuff.h
 	gui/Panels/ConfigurationPanels.h
 	gui/Panels/LogOptionsPanels.h
diff --git a/pcsx2/Linux/pcsx2.cbp b/pcsx2/Linux/pcsx2.cbp
index 06ccbab69c..f57e269646 100644
--- a/pcsx2/Linux/pcsx2.cbp
+++ b/pcsx2/Linux/pcsx2.cbp
@@ -6,6 +6,7 @@
 		<Option platforms="Windows;Unix;" />
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
+		<Option virtualFolders="Memory Card/;" />
 		<Build>
 			<Target title="Debug">
 				<Option platforms="Windows;Unix;" />
@@ -381,7 +382,9 @@
 		<Unit filename="../gui/Dialogs/ImportSettingsDialog.cpp" />
 		<Unit filename="../gui/Dialogs/LogOptionsDialog.cpp" />
 		<Unit filename="../gui/Dialogs/LogOptionsDialog.h" />
-		<Unit filename="../gui/Dialogs/McdConfigDialog.cpp" />
+		<Unit filename="../gui/Dialogs/McdConfigDialog.cpp">
+			<Option virtualFolder="Memory Card/" />
+		</Unit>
 		<Unit filename="../gui/Dialogs/ModalPopups.h" />
 		<Unit filename="../gui/Dialogs/PickUserModeDialog.cpp" />
 		<Unit filename="../gui/Dialogs/StuckThreadDialog.cpp" />
@@ -399,7 +402,10 @@
 		<Unit filename="../gui/MainFrame.cpp" />
 		<Unit filename="../gui/MainFrame.h" />
 		<Unit filename="../gui/MainMenuClicks.cpp" />
-		<Unit filename="../gui/MemoryCardFile.cpp" />
+		<Unit filename="../gui/MemoryCardFile.cpp">
+			<Option virtualFolder="Memory Card/" />
+		</Unit>
+		<Unit filename="../gui/MemoryCardFile.h" />
 		<Unit filename="../gui/MessageBoxes.cpp" />
 		<Unit filename="../gui/Panels/AudioPanel.cpp" />
 		<Unit filename="../gui/Panels/BaseApplicableConfigPanel.cpp" />
@@ -412,10 +418,16 @@
 		<Unit filename="../gui/Panels/GameFixesPanel.cpp" />
 		<Unit filename="../gui/Panels/LogOptionsPanels.cpp" />
 		<Unit filename="../gui/Panels/LogOptionsPanels.h" />
-		<Unit filename="../gui/Panels/MemoryCardListPanel.cpp" />
-		<Unit filename="../gui/Panels/MemoryCardListView.cpp" />
+		<Unit filename="../gui/Panels/MemoryCardListPanel.cpp">
+			<Option virtualFolder="Memory Card/" />
+		</Unit>
+		<Unit filename="../gui/Panels/MemoryCardListView.cpp">
+			<Option virtualFolder="Memory Card/" />
+		</Unit>
 		<Unit filename="../gui/Panels/MemoryCardPanels.h" />
-		<Unit filename="../gui/Panels/MemoryCardsPanel.cpp" />
+		<Unit filename="../gui/Panels/MemoryCardsPanel.cpp">
+			<Option virtualFolder="Memory Card/" />
+		</Unit>
 		<Unit filename="../gui/Panels/MiscPanelStuff.cpp" />
 		<Unit filename="../gui/Panels/PathsPanel.cpp" />
 		<Unit filename="../gui/Panels/PluginSelectorPanel.cpp" />
diff --git a/pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp b/pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp
index a79b10462f..607527b753 100644
--- a/pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp
+++ b/pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp
@@ -61,7 +61,7 @@ Dialogs::CreateMemoryCardDialog::CreateMemoryCardDialog( wxWindow* parent, uint
 	if( m_radio_CardSize ) m_radio_CardSize->Realize();
 
 	wxBoxSizer& s_buttons( *new wxBoxSizer(wxHORIZONTAL) );
-	s_buttons += new wxButton( this, wxID_OK )		| pxProportion(2);
+	s_buttons += new wxButton( this, wxID_OK, _("Create") )		| pxProportion(2);
 	s_buttons += pxStretchSpacer(3);
 	s_buttons += new wxButton( this, wxID_CANCEL ) 	| pxProportion(2);
 
@@ -88,7 +88,7 @@ Dialogs::CreateMemoryCardDialog::CreateMemoryCardDialog( wxWindow* parent, uint
 	*this += s_padding | StdExpand();
 
 
-	FindItem( wxID_OK )->SetLabel(_("Create"));
+	//FindItem( wxID_OK )->SetLabel(_("Create"));
 	Connect( wxID_OK,		wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CreateMemoryCardDialog::OnOk_Click ) );
 	//Connect( wxID_APPLY,	wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CreateMemoryCardDialog::OnApply_Click ) );
 }