diff --git a/Pages/Index.cshtml b/Pages/Index.cshtml
index 8ab2249..9d06f5d 100644
--- a/Pages/Index.cshtml
+++ b/Pages/Index.cshtml
@@ -16,7 +16,7 @@ else {
 		@Model.Displaypath <span id="state"></span> <span id="flags">[<span id="repeatButton">R</span><span id="continuousButton">C</span>]</span>
 	</h2>
 	<a class="action-muted">[..]</a>
-	<a href="?@Model.PathOneup" id="back" class="entry-muted cfont"> Go back</a>
+	<a href="?@IndexModel.Encode(Model.PathOneup)" id="back" class="entry-muted cfont"> Go back</a>
 	<br/>
 	<a class="action-muted">[--]</a>
 	<a href="/playlist/@(Request.QueryString).m3u" class="entry-muted cfont"> Download playlist</a>
@@ -25,7 +25,7 @@ else {
 	@foreach (var dir in Model.Dirs) {
 		<li>
 		<a class="action" href="#">[--]</a>
-		<a class="dir" href="?@Model.Path/@dir"> @dir</a>
+		<a class="dir" href="?@IndexModel.Encode(Model.Path + "/" + dir)"> @dir</a>
 		</li>
 	}
 	@foreach (var file in Model.Files) {