2 files changed, 10 insertions, 3 deletions
diff --git a/ui/backend/src/pty.rs b/ui/backend/src/pty.rs
index 45502892..af394d95 100644
--- a/ui/backend/src/pty.rs
+++ b/ui/backend/src/pty.rs
@@ -16,7 +16,7 @@ pub struct Pty {
 }
 
 impl Pty {
-    pub async fn open<'a>(rows: u16, cols: u16) -> Result<Self> {
+    pub async fn open<'a>(rows: u16, cols: u16, cwd: Option<String>) -> Result<Self> {
         let sys = portable_pty::native_pty_system();
 
         let pair = sys
@@ -28,7 +28,11 @@ impl Pty {
             })
             .map_err(|e| eyre!("Failed to open pty: {}", e))?;
 
-        let cmd = CommandBuilder::new_default_prog();
+        let mut cmd = CommandBuilder::new_default_prog();
+
+        if let Some(cwd) = cwd {
+            cmd.cwd(cwd);
+        }
 
         let child = pair.slave.spawn_command(cmd).unwrap();
         drop(pair.slave);
diff --git a/ui/backend/src/run/pty.rs b/ui/backend/src/run/pty.rs
index 58bfccb7..0ca5ece0 100644
--- a/ui/backend/src/run/pty.rs
+++ b/ui/backend/src/run/pty.rs
@@ -11,9 +11,12 @@ use atuin_client::{database::Sqlite, record::sqlite_store::SqliteStore, settings
 pub async fn pty_open<'a>(
     app: tauri::AppHandle,
     state: State<'a, AtuinState>,
+    cwd: Option<String>,
 ) -> Result<uuid::Uuid, String> {
     let id = uuid::Uuid::new_v4();
-    let pty = crate::pty::Pty::open(24, 80).await.unwrap();
+
+    let cwd = cwd.map(|c|shellexpand::tilde(c.as_str()).to_string());
+    let pty = crate::pty::Pty::open(24, 80, cwd).await.unwrap();
 
     let reader = pty.reader.clone();