diff --git a/app.rb b/app.rb
index 6e1feb2f..cec1275c 100644
--- a/app.rb
+++ b/app.rb
@@ -457,6 +457,10 @@ get '/dashboard' do
     params[:dir] = '/'+params[:dir]
   end
 
+  if !File.directory?(current_site.files_path(params[:dir]))
+    redirect '/dashboard'
+  end
+
   @dir = params[:dir]
   @file_list = current_site.file_list @dir
   erb :'dashboard'
diff --git a/views/_header.erb b/views/_header.erb
index 35e74557..060288e8 100644
--- a/views/_header.erb
+++ b/views/_header.erb
@@ -34,7 +34,7 @@
         </li>
       <% else %>
         <li>
-          <a href="/dashboard" class="sign-In">Dashboard</a>
+          <a href="/dashboard" class="sign-In">Edit Site</a>
         </li>
         <li>
           <a href="/settings" class="sign-In">Settings</a>