diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index bad737a43..ac8d85043 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -44,6 +44,7 @@ uuid = { version = "1.7", features = ["v4"] }
 env = "1.0.1"
 futures-util = "0.3.31"
 tokio-util = "0.7.14"
+tauri-plugin-dialog = "2.2.1"
 
 [target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
 tauri-plugin-updater = "2"
diff --git a/src-tauri/capabilities/default.json b/src-tauri/capabilities/default.json
index 9bf874d1a..1ff4c7f9a 100644
--- a/src-tauri/capabilities/default.json
+++ b/src-tauri/capabilities/default.json
@@ -16,6 +16,7 @@
     "core:window:allow-set-focus",
     "os:default",
     "log:default",
+    "dialog:default",
     "core:webview:allow-create-webview-window",
     {
       "identifier": "http:default",
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 21b886172..9a3909e62 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -16,6 +16,7 @@ use reqwest::blocking::Client;
 pub fn run() {
     tauri::Builder::default()
         .plugin(tauri_plugin_os::init())
+        .plugin(tauri_plugin_dialog::init())
         .plugin(tauri_plugin_http::init())
         .plugin(tauri_plugin_store::Builder::new().build())
         .plugin(tauri_plugin_shell::init())
diff --git a/web-app/package.json b/web-app/package.json
index d5191fb4a..089cdaa58 100644
--- a/web-app/package.json
+++ b/web-app/package.json
@@ -30,6 +30,7 @@
     "@tanstack/react-router": "^1.116.0",
     "@tanstack/react-router-devtools": "^1.116.0",
     "@tauri-apps/api": "^2.5.0",
+    "@tauri-apps/plugin-dialog": "^2.2.1",
     "@tauri-apps/plugin-os": "^2.2.1",
     "@types/react-syntax-highlighter": "^15.5.13",
     "@types/uuid": "^10.0.0",
diff --git a/web-app/src/routes/settings/general.tsx b/web-app/src/routes/settings/general.tsx
index 59ec23db1..3ae6c2659 100644
--- a/web-app/src/routes/settings/general.tsx
+++ b/web-app/src/routes/settings/general.tsx
@@ -8,6 +8,9 @@ import { Card, CardItem } from '@/containers/Card'
 import LanguageSwitcher from '@/containers/LanguageSwitcher'
 import { useTranslation } from 'react-i18next'
 import { useGeneralSetting } from '@/hooks/useGeneralSetting'
+import { useEffect, useState } from 'react'
+import { open } from '@tauri-apps/plugin-dialog'
+
 import {
   Dialog,
   DialogClose,
@@ -18,7 +21,8 @@ import {
   DialogTitle,
   DialogTrigger,
 } from '@/components/ui/dialog'
-import { factoryReset } from '@/services/app'
+import { factoryReset, getJanDataFolder } from '@/services/app'
+import { IconFolder } from '@tabler/icons-react'
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const Route = createFileRoute(route.settings.general as any)({
@@ -28,6 +32,16 @@ export const Route = createFileRoute(route.settings.general as any)({
 function General() {
   const { t } = useTranslation()
   const { spellCheckChatInput, setSpellCheckChatInput } = useGeneralSetting()
+  const [janDataFolder, setJanDataFolder] = useState<string | undefined>()
+
+  useEffect(() => {
+    const fetchDataFolder = async () => {
+      const path = await getJanDataFolder()
+      setJanDataFolder(path)
+    }
+
+    fetchDataFolder()
+  }, [])
 
   const resetApp = async () => {
     // TODO: Loading indicator
@@ -71,10 +85,47 @@ function General() {
                 title={t('settings.dataFolder.appData', {
                   ns: 'settings',
                 })}
-                description={t('settings.dataFolder.appDataDesc', {
-                  ns: 'settings',
-                })}
-                actions={<></>}
+                align="start"
+                description={
+                  <>
+                    <span>
+                      {t('settings.dataFolder.appDataDesc', {
+                        ns: 'settings',
+                      })}
+                    </span>
+                    <span
+                      title={janDataFolder}
+                      className="bg-main-view-fg/10 text-xs mt-1 px-1 py-0.5 rounded-sm text-main-view-fg/80 line-clamp-1"
+                    >
+                      {janDataFolder}
+                    </span>
+                  </>
+                }
+                actions={
+                  <Button
+                    variant="link"
+                    size="sm"
+                    className="hover:no-underline"
+                    onClick={async () => {
+                      const selectedPath = await open({
+                        multiple: false,
+                        directory: true,
+                        defaultPath: janDataFolder,
+                      })
+                      if (selectedPath === janDataFolder) return
+                      if (selectedPath !== null) {
+                        setJanDataFolder(selectedPath)
+                        // TODO: we need function to move everything into new folder selectedPath
+                        // eg like this
+                        // await window.core?.api?.moveDataFolder(selectedPath)
+                      }
+                    }}
+                  >
+                    <div className="size-6 cursor-pointer flex items-center justify-center rounded hover:bg-main-view-fg/15 bg-main-view-fg/10 transition-all duration-200 ease-in-out">
+                      <IconFolder size={18} className="text-main-view-fg/50" />
+                    </div>
+                  </Button>
+                }
               />
               <CardItem
                 title={t('settings.dataFolder.appLogs', {
diff --git a/web-app/src/services/app.ts b/web-app/src/services/app.ts
index 77a71df8c..fc8665da7 100644
--- a/web-app/src/services/app.ts
+++ b/web-app/src/services/app.ts
@@ -7,10 +7,7 @@ import { invoke } from '@tauri-apps/api/core'
  * @returns {Promise<void>}
  */
 export const factoryReset = async () => {
-  const appConfiguration: AppConfiguration | undefined =
-    await window.core?.api?.getAppConfigurations()
-
-  const janDataFolderPath = appConfiguration?.data_folder
+  const janDataFolderPath = await getJanDataFolder()
   if (janDataFolderPath) await fs.rm(janDataFolderPath)
   window.localStorage.clear()
   await window.core?.api?.installExtensions()
@@ -50,3 +47,20 @@ export const parseLogLine = (line: string) => {
     message,
   }
 }
+
+/**
+ * @description This function is used to get the Jan data folder path.
+ * It retrieves the path from the app configuration.
+ * @returns {Promise<string | undefined>} The Jan data folder path or undefined if not found
+ */
+export const getJanDataFolder = async (): Promise<string | undefined> => {
+  try {
+    const appConfiguration: AppConfiguration | undefined =
+      await window.core?.api?.getAppConfigurations()
+
+    return appConfiguration?.data_folder
+  } catch (error) {
+    console.error('Failed to get Jan data folder:', error)
+    return undefined
+  }
+}