diff --git a/Cargo.lock b/Cargo.lock
index 2e7b580..da502e6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1337,6 +1337,7 @@ dependencies = [
  "miette",
  "parse_datetime 0.8.0",
  "rustyline",
+ "tempfile",
  "tokio",
  "uu_date",
  "uu_ls",
diff --git a/crates/shell/Cargo.toml b/crates/shell/Cargo.toml
index ef2e581..5b74b76 100644
--- a/crates/shell/Cargo.toml
+++ b/crates/shell/Cargo.toml
@@ -43,6 +43,9 @@ windows-sys = { version = "0.59.0", features = ["Win32_Foundation", "Win32_Syste
 ctrlc = "3.4.5"
 libc = "0.2.170"
 
+[dev-dependencies]
+tempfile = "3.14.0"
+
 [package.metadata.release]
 # Dont publish the binary
 release = false
diff --git a/crates/shell/src/completion.rs b/crates/shell/src/completion.rs
index 5f9c020..3ef502b 100644
--- a/crates/shell/src/completion.rs
+++ b/crates/shell/src/completion.rs
@@ -85,7 +85,7 @@ struct FileMatch {
 }
 
 impl FileMatch {
-    fn from_entry(entry: fs::DirEntry, base_path: &Path) -> Option<Self> {
+    fn from_entry(entry: fs::DirEntry, base_path: &Path, show_hidden: bool) -> Option<Self> {
         let metadata = match entry.metadata() {
             Ok(m) => m,
             Err(_) => return None,
@@ -93,8 +93,8 @@ impl FileMatch {
 
         let name = entry.file_name().into_string().ok()?;
 
-        // Skip hidden files
-        if name.starts_with('.') {
+        // Skip hidden files unless explicitly requested
+        if !show_hidden && name.starts_with('.') {
             return None;
         }
 
@@ -175,12 +175,13 @@ fn complete_filenames(is_start: bool, word: &str, matches: &mut Vec<Pair>) {
 
     let search_dir = resolve_dir_path(dir_path);
     let only_executable = (word.starts_with("./") || word.starts_with('/')) && is_start;
+    let show_hidden = partial_name.starts_with('.');
 
     let files: Vec<FileMatch> = fs::read_dir(&search_dir)
         .into_iter()
         .flatten()
         .flatten()
-        .filter_map(|entry| FileMatch::from_entry(entry, &search_dir))
+        .filter_map(|entry| FileMatch::from_entry(entry, &search_dir, show_hidden))
         .filter(|f| f.name.starts_with(partial_name))
         .filter(|f| !only_executable || f.is_executable || f.is_dir)
         .collect();
@@ -250,3 +251,115 @@ impl Highlighter for ShellCompleter {
 impl Validator for ShellCompleter {}
 
 impl Helper for ShellCompleter {}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use rustyline::history::DefaultHistory;
+    use std::fs;
+    use tempfile::TempDir;
+
+    #[tokio::test]
+    async fn test_complete_hidden_files_when_starting_with_dot() {
+        let temp_dir = TempDir::new().unwrap();
+        let temp_path = temp_dir.path();
+
+        // Create some test files and directories
+        fs::File::create(temp_path.join(".gitignore")).unwrap();
+        fs::create_dir(temp_path.join(".github")).unwrap();
+        fs::File::create(temp_path.join(".hidden_file")).unwrap();
+        fs::File::create(temp_path.join("visible_file.txt")).unwrap();
+
+        // Test completion with "." prefix
+        let completer = ShellCompleter::new(HashSet::new());
+        let history = DefaultHistory::new();
+        let line = format!("cat {}/.gi", temp_path.display());
+        let pos = line.len();
+        let (_start, matches) = completer
+            .complete(&line, pos, &Context::new(&history))
+            .unwrap();
+
+        // Should find .gitignore and .github/
+        assert_eq!(matches.len(), 2);
+        let displays: Vec<&str> = matches.iter().map(|m| m.display.as_str()).collect();
+        assert!(displays.contains(&".github/"));
+        assert!(displays.contains(&".gitignore"));
+    }
+
+    #[tokio::test]
+    async fn test_skip_hidden_files_when_not_starting_with_dot() {
+        let temp_dir = TempDir::new().unwrap();
+        let temp_path = temp_dir.path();
+
+        // Create some test files and directories
+        fs::File::create(temp_path.join(".gitignore")).unwrap();
+        fs::create_dir(temp_path.join(".github")).unwrap();
+        fs::File::create(temp_path.join("visible_file.txt")).unwrap();
+        fs::File::create(temp_path.join("another_file.txt")).unwrap();
+
+        // Test completion without "." prefix
+        let completer = ShellCompleter::new(HashSet::new());
+        let history = DefaultHistory::new();
+        let line = format!("cat {}/", temp_path.display());
+        let pos = line.len();
+        let (_start, matches) = completer
+            .complete(&line, pos, &Context::new(&history))
+            .unwrap();
+
+        // Should only find visible files, not hidden ones
+        let displays: Vec<&str> = matches.iter().map(|m| m.display.as_str()).collect();
+        assert!(!displays.iter().any(|d| d.starts_with('.')));
+        assert!(displays.len() >= 2); // Should have at least the two visible files
+    }
+
+    #[tokio::test]
+    async fn test_complete_github_directory() {
+        let temp_dir = TempDir::new().unwrap();
+        let temp_path = temp_dir.path();
+
+        // Create .github directory and other dot files
+        fs::create_dir(temp_path.join(".github")).unwrap();
+        fs::File::create(temp_path.join(".gitignore")).unwrap();
+        fs::File::create(temp_path.join(".git_keep")).unwrap();
+
+        // Test completion with ".gith" prefix
+        let completer = ShellCompleter::new(HashSet::new());
+        let history = DefaultHistory::new();
+        let line = format!("cd {}/.gith", temp_path.display());
+        let pos = line.len();
+        let (_start, matches) = completer
+            .complete(&line, pos, &Context::new(&history))
+            .unwrap();
+
+        // Should find .github/
+        assert_eq!(matches.len(), 1);
+        assert_eq!(matches[0].display, ".github/");
+    }
+
+    #[tokio::test]
+    async fn test_complete_all_hidden_with_dot() {
+        let temp_dir = TempDir::new().unwrap();
+        let temp_path = temp_dir.path();
+
+        // Create several hidden files
+        fs::File::create(temp_path.join(".env")).unwrap();
+        fs::File::create(temp_path.join(".bashrc")).unwrap();
+        fs::create_dir(temp_path.join(".config")).unwrap();
+
+        // Test completion with just "." prefix
+        let completer = ShellCompleter::new(HashSet::new());
+        let history = DefaultHistory::new();
+        let line = format!("ls {}/.", temp_path.display());
+        let pos = line.len();
+        let (_start, matches) = completer
+            .complete(&line, pos, &Context::new(&history))
+            .unwrap();
+
+        // Should find all hidden files
+        assert!(matches.len() >= 3);
+        let displays: Vec<&str> = matches.iter().map(|m| m.display.as_str()).collect();
+        assert!(displays.contains(&".env"));
+        assert!(displays.contains(&".bashrc"));
+        assert!(displays.contains(&".config/"));
+    }
+}