diff --git a/src/dir.rs b/src/dir.rs
index 579dfc9..1591086 100644
--- a/src/dir.rs
+++ b/src/dir.rs
@@ -60,10 +60,11 @@ impl Dir {
     }
 
     /// Get a string describing the Git status of the given file.
-    pub fn git_status(&self, path: &Path) -> String {
-        match self.git {
-            Some(ref git) => git.status(path),
-            None => GREY.paint("--").to_string(),
+    pub fn git_status(&self, path: &Path, prefix_lookup: bool) -> String {
+        match (&self.git, prefix_lookup) {
+            (&Some(ref git), false) => git.status(path),
+            (&Some(ref git), true)  => git.dir_status(path),
+            (&None, _)              => GREY.paint("--").to_string(),
         }
     }
 }
@@ -88,12 +89,27 @@ impl Git {
 
     /// Get the status for the file at the given path, if present.
     fn status(&self, path: &Path) -> String {
-        match self.statuses.iter().find(|&&(ref p, _)| path.as_str().unwrap() == p.as_slice()) {
+        let status = self.statuses.iter()
+                                  .find(|p| p.0 == path.as_str().unwrap());
+
+        match status {
             Some(&(_, s)) => format!("{}{}", Git::index_status(s), Git::working_tree_status(s)),
             None => GREY.paint("--").to_string(),
         }
     }
 
+    /// Get the combined status for all the files whose paths begin with the
+    /// path that gets passed in. This is used for getting the status of
+    /// directories, which don't really have an 'official' status.
+    fn dir_status(&self, dir: &Path) -> String {
+        let status = self.statuses.iter()
+                                  .filter(|p| p.0.starts_with(dir.as_str().unwrap()))
+                                  .fold(git2::Status::empty(), |a, b| a | b.1);
+        match status {
+            s => format!("{}{}", Git::index_status(s), Git::working_tree_status(s)),
+        }
+    }
+
     /// The character to display if the file has been modified, but not staged.
     fn working_tree_status(status: git2::Status) -> ANSIString<'static> {
         match status {
diff --git a/src/file.rs b/src/file.rs
index 060b4f5..e6470d4 100644
--- a/src/file.rs
+++ b/src/file.rs
@@ -372,7 +372,11 @@ impl<'a> File<'a> {
     }
 
     fn git_status(&self) -> Cell {
-        let status = self.dir.map(|d| d.git_status(&self.path)).unwrap_or("NO".to_string());
+        let status = match self.dir {
+            Some(d) => d.git_status(&self.path, self.stat.kind == io::FileType::Directory),
+            None    => GREY.paint("--").to_string(),
+        };
+
         Cell { text: status, length: 2 }
     }
 }