diff --git a/build/index.php b/build/index.php
index 9b482d8..4bd9851 100644
--- a/build/index.php
+++ b/build/index.php
@@ -2078,16 +2078,12 @@ register_module([
 				$filepath = $pageindex->{$env->page}->uploadedfilepath;
 				$mime_type = $pageindex->{$env->page}->uploadedfilemime;
 				$dimensions = getimagesize($env->storage_prefix . $filepath);
-				$image_link = "//" . $_SERVER["SERVER_NAME"] . dirname($_SERVER["SCRIPT_NAME"]) . $filepath;
-				if($env->storage_prefix !== "./")
-					$image_link = "?action=preview&size=original&page=" . rawurlencode($env->page);
-				
 				
 				$preview_sizes = [ 256, 512, 768, 1024, 1536 ];
 				$preview_html = "<figure class='preview'>
 			<img src='?action=preview&size=$settings->default_preview_size&page=" . rawurlencode($env->page) . "' />
 			<nav class='image-controls'>
-				<ul><li><a href='$filepath'>&#x01f304; Original image</a></li>
+				<ul><li><a href='" . ($env->storage_prefix == "./" ? $filepath : "?action=preview&size=original&page=" . rawurlencode($env->page)) . "'>&#x01f304; Original image</a></li>
 				<li>Other Sizes: ";
 				foreach($preview_sizes as $size)
 					$preview_html .= "<a href='?action=preview&size='$size>$size" . "px</a> ";
diff --git a/module_index.json b/module_index.json
index 9da5d89..74b849b 100644
--- a/module_index.json
+++ b/module_index.json
@@ -59,7 +59,7 @@
         "author": "Starbeamrainbowlabs",
         "description": "Adds the ability to upload files to Pepperminty Wiki. Uploaded files act as pages and have the special 'File:' prefix.",
         "id": "feature-upload",
-        "lastupdate": 1447053195,
+        "lastupdate": 1447053529,
         "optional": false
     },
     {
diff --git a/modules/feature-upload.php b/modules/feature-upload.php
index 5b6a895..d8a5f48 100644
--- a/modules/feature-upload.php
+++ b/modules/feature-upload.php
@@ -235,16 +235,12 @@ register_module([
 				$filepath = $pageindex->{$env->page}->uploadedfilepath;
 				$mime_type = $pageindex->{$env->page}->uploadedfilemime;
 				$dimensions = getimagesize($env->storage_prefix . $filepath);
-				$image_link = "//" . $_SERVER["SERVER_NAME"] . dirname($_SERVER["SCRIPT_NAME"]) . $filepath;
-				if($env->storage_prefix !== "./")
-					$image_link = "?action=preview&size=original&page=" . rawurlencode($env->page);
-				
 				
 				$preview_sizes = [ 256, 512, 768, 1024, 1536 ];
 				$preview_html = "<figure class='preview'>
 			<img src='?action=preview&size=$settings->default_preview_size&page=" . rawurlencode($env->page) . "' />
 			<nav class='image-controls'>
-				<ul><li><a href='$filepath'>&#x01f304; Original image</a></li>
+				<ul><li><a href='" . ($env->storage_prefix == "./" ? $filepath : "?action=preview&size=original&page=" . rawurlencode($env->page)) . "'>&#x01f304; Original image</a></li>
 				<li>Other Sizes: ";
 				foreach($preview_sizes as $size)
 					$preview_html .= "<a href='?action=preview&size='$size>$size" . "px</a> ";