diff --git a/assets/js/page_upload.js b/assets/js/page_upload.js
index 38f2e7f4665594bfc3767a2182409ae4f14ffbd8..33b5b67108f69d1b5c0b144e0f34680c8cc17a58 100644
--- a/assets/js/page_upload.js
+++ b/assets/js/page_upload.js
@@ -64,8 +64,8 @@ element.addEventListener("change", () => {
             postData("/upload/", data).then((json) => {
                 image_container.classList.remove("uploading");
                 if (json.success) {
-                    image_link.href = "/" + json.id;
-                    image.src = "/" + json.id;
+                    image_link.href = "/" + json.id + ".png";
+                    image.src = "/" + json.id + ".png";
                 } else {
                     const image_error = document.createElement("div");
                     image_error.classList.add("alert", "error");
diff --git a/templates/image_detail.html b/templates/image_detail.html
index 7c125e01930f7ad599e2f9aa7d022fe18741f00e..abd530b355be7d0e29a4080e67b9a9893146bbde 100644
--- a/templates/image_detail.html
+++ b/templates/image_detail.html
@@ -7,7 +7,7 @@
     {{else}}
         <h2 class="title">{{.Image.Title}}</h2>
     {{end}}
-        <a class="image" href="/{{.Image.Id}}">
+        <a class="image" href="/{{.Image.Id}}.png">
             <img src="/{{.Image.Id}}.png">
         </a>
     {{if .IsMine}}
@@ -44,7 +44,7 @@
         <div class="url">
             <p>Direct Link</p>
             <div>
-                <input id="url_direct" type="text" value="https://i.k8r.eu/{{.Image.Id}}">
+                <input id="url_direct" type="text" value="https://i.k8r.eu/{{.Image.Id}}.png">
                 <button class="copy" data-target="#url_direct">Copy</button>
             </div>
         </div>