diff --git a/.gitignore b/.gitignore
index a93b8139a..ff17f9e33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,8 +51,8 @@ coverage.xml
 # Django stuff:
 *.log
 
-# Sphinx documentation
-docs/_build/
+# MkDocs documentation
+site/
 
 # PyBuilder
 target/
diff --git a/docs/index.md b/docs/index.md
index 7ecd8c717..75a09b229 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -6,7 +6,7 @@
 physical documents into a searchable online archive so you can keep, well, _less paper_.
 
 [Get started](/setup/){ .md-button .md-button--primary .index-callout }
-[Demo](https://demo.paperless-ngx.com){ .md-button .md-button--secondary }
+[Demo](https://demo.paperless-ngx.com){ .md-button .md-button--secondary target=\_blank }
 
 </div>
 <div class="grid-right" markdown>
diff --git a/mkdocs.yml b/mkdocs.yml
index 8339c957c..9de918b5b 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -27,6 +27,7 @@ theme:
     repo: fontawesome/brands/github
   favicon: assets/favicon.png
 repo_url: https://github.com/paperless-ngx/paperless-ngx
+edit_uri: blob/main/docs/
 extra_css:
   - assets/extra.css
 markdown_extensions: