diff --git a/reactos/base/applications/rapps/lang/de-DE.rc b/reactos/base/applications/rapps/lang/de-DE.rc
index b48f0ea2229..ea4dbc80de6 100644
--- a/reactos/base/applications/rapps/lang/de-DE.rc
+++ b/reactos/base/applications/rapps/lang/de-DE.rc
@@ -185,7 +185,7 @@ BEGIN
 	IDS_UPDATES "Aktualisierungen"
 	IDS_APPLICATIONS "Anwendungen"
 	IDS_CHOOSE_FOLDER_TEXT "Wählen Sie ein Verzeichnis aus, das zum Herunterladen verwendet werden soll:"
-	IDS_CHOOSE_FOLDER_ERROR "Sie haben ein nicht existentes Verzeichnis angegeben!"
+	IDS_CHOOSE_FOLDER_ERROR "Sie haben ein nicht existierendes Verzeichnis angegeben! Neu anlegen?"
 	IDS_USER_NOT_ADMIN "Sie müssen als Administrator angemeldet sein, um den Anwendungsmanager zu starten!"
 	IDS_APP_REG_REMOVE "Sind Sie sich sicher, dass Sie die Daten dieses Programms aus der Registry entfernen möchten?"
 	IDS_INFORMATION "Informationen"
diff --git a/reactos/base/applications/rapps/lang/en-US.rc b/reactos/base/applications/rapps/lang/en-US.rc
index f8d018923dc..677ca86c13b 100644
--- a/reactos/base/applications/rapps/lang/en-US.rc
+++ b/reactos/base/applications/rapps/lang/en-US.rc
@@ -185,7 +185,7 @@ BEGIN
 	IDS_UPDATES "Updates"
 	IDS_APPLICATIONS "Applications"
 	IDS_CHOOSE_FOLDER_TEXT "Choose a folder which will store Downloads:"
-	IDS_CHOOSE_FOLDER_ERROR "The folder you have specified does not exist."
+	IDS_CHOOSE_FOLDER_ERROR "The folder you have specified does not exist. Create it?"
 	IDS_USER_NOT_ADMIN "You must be an administrator to start ""ReactOS Applications Manager""!"
 	IDS_APP_REG_REMOVE "Are you sure you want to delete the data on the installed program from the registry?"
 	IDS_INFORMATION "Information"
diff --git a/reactos/base/applications/rapps/settingsdlg.c b/reactos/base/applications/rapps/settingsdlg.c
index 3764f0140bb..77034c51f5a 100644
--- a/reactos/base/applications/rapps/settingsdlg.c
+++ b/reactos/base/applications/rapps/settingsdlg.c
@@ -115,7 +115,14 @@ SettingsDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam)
                                     IDS_CHOOSE_FOLDER_ERROR,
                                     szMsgText, sizeof(szMsgText) / sizeof(WCHAR));
 
-                        MessageBoxW(hDlg, szMsgText, NULL, MB_OK | MB_ICONERROR);
+                        if (MessageBoxW(hDlg, szMsgText, NULL, MB_YESNO) == IDYES)
+                        {
+                            if (CreateDirectoryW(szDir, NULL))
+                            {
+                                EndDialog(hDlg, LOWORD(wParam));
+                            }
+                        }
+
                         SetFocus(GetDlgItem(hDlg, IDC_DOWNLOAD_DIR_EDIT));
                         break;
                     }