diff --git a/site/.htaccess b/site/.htaccess
index 2b45f17..9158f41 100644
--- a/site/.htaccess
+++ b/site/.htaccess
@@ -1,9 +1,18 @@
 <IfModule mod_rewrite.c>
-    RewriteEngine on
-    RewriteRule    ^$    webroot/    [L]
-    RewriteRule    (.*) webroot/$1    [L]
+  RewriteEngine  on 
+
+   RewriteRule    ^$ webroot/    [L]
+
+   # Need this prevent a 400 error without trailing /
+   RewriteCond  %{REQUEST_FILENAME} !-d
+   RewriteRule    (.*)  webroot/$1 [L]
+
  </IfModule>
 
+# Need to make sure directories can't be listed, since the rewrite
+# rule excludes rewriting when an actual directory is requested
+Options -Indexes
+
 # Provide a mechanism for user authentication
 AuthType Basic
 AuthName "Valley Storage"