diff --git a/website/docs/source/layouts/layout.erb b/website/docs/source/layouts/layout.erb
index c544e133e..09cf92b42 100644
--- a/website/docs/source/layouts/layout.erb
+++ b/website/docs/source/layouts/layout.erb
@@ -338,15 +338,18 @@
 				<div class="row">
 					<div class="span12">
 
+            <% relative_path = current_page.path.match(/.*\//).to_s
+            file = current_page.source_file.split("/").last
+            github_link = "https://github.com/mitchellh/vagrant/blob/master/website/docs/source/#{relative_path}#{file}"
+            %>
+            <div class="edit-page-link">
+              <a href="<%= github_link %>">Edit this page</a>
+            </div>
+
 						<ul class="unstyled footer-nav">
 							<li><a href="https://docs.vagrantup.com/">Documentation</a></li>
 							<li><a href="https://www.vagrantup.com/about">About</a></li>
 							<li><a href="https://www.vagrantup.com/support">Support</a></li>
-							<% relative_path = current_page.path.match(/.*\//).to_s
-							file = current_page.source_file.split("/").last
-							github_link = "https://github.com/mitchellh/vagrant/blob/master/website/docs/source/#{relative_path}#{file}"
-							%>
-							<li class="li-under"><a href="<%= github_link %>">Edit this page</a></li>
 							<a href="https://www.vagrantup.com/downloads">
 								<li class="button inline-button">Download</li>
 							</a>
diff --git a/website/docs/source/stylesheets/_footer.less b/website/docs/source/stylesheets/_footer.less
index 1f5635808..9c74f93e6 100644
--- a/website/docs/source/stylesheets/_footer.less
+++ b/website/docs/source/stylesheets/_footer.less
@@ -2,6 +2,7 @@
 
 footer {
 padding: 80px 0;
+margin-top: 20px;
 background: @black url(/images/footer_background.png) center center;
 text-align: center;
 color: @white;
@@ -94,8 +95,23 @@ position: relative; //z-index needs position!
 			}
 		} //contact link
 
-
-
-
-
 } //footer
+
+.edit-page-link{
+  position: absolute;
+  top: -120px;
+  right: 15px;
+  z-index: 9999;
+
+  a{
+    text-transform: uppercase;
+    color: @black;
+    font-size: 13px;
+  }
+}
+
+@media (max-width: 480px){
+  .edit-page-link{
+    top: -90px;
+  }
+}