diff --git a/Source/Core/DiscIO/Src/FileSystemGCWii.cpp b/Source/Core/DiscIO/Src/FileSystemGCWii.cpp
index 1d03e00b5c..64d108071a 100644
--- a/Source/Core/DiscIO/Src/FileSystemGCWii.cpp
+++ b/Source/Core/DiscIO/Src/FileSystemGCWii.cpp
@@ -248,15 +248,15 @@ bool CFileSystemGCWii::DetectFileSystem()
 	if (Read32(0x18) == 0x5D1C9EA3)
 	{
 		m_OffsetShift = 2; // Wii file system
+		return true;
 	}
 	else if (Read32(0x1c) == 0xC2339F3D)
 	{
 		m_OffsetShift = 0; // GC file system
+		return true;
 	}
-	else
-	{
-		return false;
-	}
+
+	return false;
 }
 
 void CFileSystemGCWii::InitFileSystem()
diff --git a/Source/Core/DiscIO/Src/FileSystemGCWii.h b/Source/Core/DiscIO/Src/FileSystemGCWii.h
index 47fcc417eb..38e5f181f9 100644
--- a/Source/Core/DiscIO/Src/FileSystemGCWii.h
+++ b/Source/Core/DiscIO/Src/FileSystemGCWii.h
@@ -40,9 +40,8 @@ public:
 	virtual bool ExportDOL(const char* _rExportFolder) const;
 
 private:
-
-	bool m_Valid;
 	bool m_Initialized;
+	bool m_Valid;
 
 	u32 m_OffsetShift; // WII offsets are all shifted
 	std::vector <SFileInfo> m_FileInfoVector;