diff --git a/Common/System/System.h b/Common/System/System.h
index a95736f4fc..57cee7bd72 100644
--- a/Common/System/System.h
+++ b/Common/System/System.h
@@ -56,6 +56,7 @@ enum SystemProperty {
 	SYSPROP_GPUDRIVER_VERSION,
 
 	SYSPROP_HAS_FILE_BROWSER,
+	SYSPROP_HAS_FOLDER_BROWSER,
 	SYSPROP_HAS_IMAGE_BROWSER,
 	SYSPROP_HAS_BACK_BUTTON,
 
diff --git a/Qt/QtMain.cpp b/Qt/QtMain.cpp
index 8e84fb230a..4dfeaebeb5 100644
--- a/Qt/QtMain.cpp
+++ b/Qt/QtMain.cpp
@@ -199,6 +199,7 @@ bool System_GetPropertyBool(SystemProperty prop) {
 	case SYSPROP_HAS_BACK_BUTTON:
 		return true;
 	case SYSPROP_HAS_FILE_BROWSER:
+	case SYSPROP_HAS_FOLDER_BROWSER:
 		return true;
 	case SYSPROP_APP_GOLD:
 #ifdef GOLD
diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp
index 307f854006..1588e58af4 100644
--- a/UI/MainScreen.cpp
+++ b/UI/MainScreen.cpp
@@ -546,19 +546,15 @@ UI::EventReturn GameBrowser::LastClick(UI::EventParams &e) {
 }
 
 UI::EventReturn GameBrowser::HomeClick(UI::EventParams &e) {
-#if PPSSPP_PLATFORM(ANDROID) || PPSSPP_PLATFORM(SWITCH)
-	SetPath(g_Config.memStickDirectory);
-#elif defined(USING_QT_UI) || defined(USING_WIN_UI)
-	if (System_GetPropertyBool(SYSPROP_HAS_FILE_BROWSER)) {
+#if PPSSPP_PLATFORM(ANDROID) || PPSSPP_PLATFORM(SWITCH) || defined(USING_QT_UI) || defined(USING_WIN_UI) || PPSSPP_PLATFORM(UWP)
+	if (System_GetPropertyBool(SYSPROP_HAS_FOLDER_BROWSER)) {
 		System_SendMessage("browse_folder", "");
+	} else {
+		SetPath(g_Config.memStickDirectory);
 	}
-#elif PPSSPP_PLATFORM(UWP)
-	// TODO UWP
-	SetPath(g_Config.memStickDirectory);
 #else
 	SetPath(getenv("HOME"));
 #endif
-
 	return UI::EVENT_DONE;
 }
 
diff --git a/UWP/PPSSPP_UWPMain.cpp b/UWP/PPSSPP_UWPMain.cpp
index 4de2859f70..4248c5fa2b 100644
--- a/UWP/PPSSPP_UWPMain.cpp
+++ b/UWP/PPSSPP_UWPMain.cpp
@@ -398,6 +398,8 @@ bool System_GetPropertyBool(SystemProperty prop) {
 	switch (prop) {
 	case SYSPROP_HAS_FILE_BROWSER:
 		return true;
+	case SYSPROP_HAS_FOLDER_BROWSER:
+		return false;  // at least I don't know a usable one
 	case SYSPROP_HAS_IMAGE_BROWSER:
 		return false;
 	case SYSPROP_HAS_BACK_BUTTON:
diff --git a/Windows/main.cpp b/Windows/main.cpp
index 3ffe67259e..1153376021 100644
--- a/Windows/main.cpp
+++ b/Windows/main.cpp
@@ -266,6 +266,7 @@ float System_GetPropertyFloat(SystemProperty prop) {
 bool System_GetPropertyBool(SystemProperty prop) {
 	switch (prop) {
 	case SYSPROP_HAS_FILE_BROWSER:
+	case SYSPROP_HAS_FOLDER_BROWSER:
 		return true;
 	case SYSPROP_HAS_IMAGE_BROWSER:
 		return true;
diff --git a/ffmpeg b/ffmpeg
index 4738685f4a..0b28335ace 160000
--- a/ffmpeg
+++ b/ffmpeg
@@ -1 +1 @@
-Subproject commit 4738685f4ac27c1775a238d1e602f399627b5e6f
+Subproject commit 0b28335acea4f429ae798c5e75232e54881bf164