diff --git a/Cargo.lock b/Cargo.lock
index 88e2e49..3b3c599 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1917,7 +1917,7 @@ checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546"
 
 [[package]]
 name = "xplr"
-version = "0.21.4"
+version = "0.21.5"
 dependencies = [
  "ansi-to-tui",
  "anyhow",
diff --git a/Cargo.toml b/Cargo.toml
index e00b5f6..edf07d1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,7 @@ path = './benches/criterion.rs'
 
 [package]
 name = 'xplr'
-version = '0.21.4'
+version = '0.21.5'
 authors = ['Arijit Basu <hi@arijitbasu.in>']
 edition = '2021'
 description = 'A hackable, minimal, fast TUI file explorer'
@@ -90,3 +90,5 @@ panic = 'abort'
 strip = true
 
 [features]
+
+
diff --git a/docs/en/src/upgrade-guide.md b/docs/en/src/upgrade-guide.md
index f6a5a14..a91e281 100644
--- a/docs/en/src/upgrade-guide.md
+++ b/docs/en/src/upgrade-guide.md
@@ -45,7 +45,7 @@ compatibility.
 
 ### Instructions
 
-#### [v0.20.2][48] -> [v0.21.4][49]
+#### [v0.20.2][48] -> [v0.21.5][49]
 
 - Some plugins might stop rendering colors. Wait for them to update.
 - Rename `xplr.config.general.sort_and_filter_ui.search_identifier` to
@@ -521,5 +521,5 @@ Else do the following:
 [46]: https://github.com/sayanarijit/xplr/releases/tag/v0.18.0
 [47]: https://github.com/sayanarijit/xplr/releases/tag/v0.19.4
 [48]: https://github.com/sayanarijit/xplr/releases/tag/v0.20.2
-[49]: https://github.com/sayanarijit/xplr/releases/tag/v0.21.4
+[49]: https://github.com/sayanarijit/xplr/releases/tag/v0.21.5
 [50]: https://github.com/lotabout/skim#search-syntax
diff --git a/src/app.rs b/src/app.rs
index e27a947..1ae8dfc 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -420,7 +420,7 @@ impl App {
             config,
             vroot,
             initial_vroot,
-            pwd,
+            pwd: pwd.clone(),
             initial_pwd,
             directory_buffer: Default::default(),
             last_focus: Default::default(),
@@ -435,7 +435,7 @@ impl App {
             explorer_config,
             logs: Default::default(),
             logs_hidden: Default::default(),
-            history: Default::default(),
+            history: History::default().push(format!("{pwd}/")),
             last_modes: Default::default(),
             hostname,
             hooks,
diff --git a/src/lua/mod.rs b/src/lua/mod.rs
index 21fe54d..6bd0823 100644
--- a/src/lua/mod.rs
+++ b/src/lua/mod.rs
@@ -160,24 +160,24 @@ mod tests {
         assert!(check_version(VERSION, "foo path").is_ok());
 
         // Current release if OK
-        assert!(check_version("0.21.4", "foo path").is_ok());
+        assert!(check_version("0.21.5", "foo path").is_ok());
 
         // Prev major release is ERR
         // - Not yet
 
         // Prev minor release is ERR (Change when we get to v1)
-        assert!(check_version("0.20.4", "foo path").is_err());
+        assert!(check_version("0.20.5", "foo path").is_err());
 
         // Prev bugfix release is OK
-        assert!(check_version("0.21.3", "foo path").is_ok());
+        assert!(check_version("0.21.4", "foo path").is_ok());
 
         // Next major release is ERR
-        assert!(check_version("1.20.4", "foo path").is_err());
+        assert!(check_version("1.20.5", "foo path").is_err());
 
         // Next minor release is ERR
-        assert!(check_version("0.22.4", "foo path").is_err());
+        assert!(check_version("0.22.5", "foo path").is_err());
 
         // Next bugfix release is ERR (Change when we get to v1)
-        assert!(check_version("0.21.5", "foo path").is_err());
+        assert!(check_version("0.21.6", "foo path").is_err());
     }
 }