diff --git a/commands/server.go b/commands/server.go
index 8299a2916..98ea60f4e 100644
--- a/commands/server.go
+++ b/commands/server.go
@@ -135,6 +135,8 @@ func serve(port int) {
 	}
 }
 
+// fixUrl massages the BaseUrl into a form needed for serving
+// all pages correctly.
 func fixUrl(s string) (string, error) {
 	useLocalhost := false
 	if s == "" {
@@ -144,6 +146,9 @@ func fixUrl(s string) (string, error) {
 	if !strings.HasPrefix(s, "http://") && !strings.HasPrefix(s, "https://") {
 		s = "http://" + s
 	}
+	if !strings.HasSuffix(s, "/") {
+		s = s + "/"
+	}
 	u, err := url.Parse(s)
 	if err != nil {
 		return "", err