diff --git a/code/game/objects/items/wiki_manuals.dm b/code/game/objects/items/wiki_manuals.dm
index e3647434e61..bbb98a7867e 100644
--- a/code/game/objects/items/wiki_manuals.dm
+++ b/code/game/objects/items/wiki_manuals.dm
@@ -3,28 +3,40 @@
 /// The size of the window that the wiki books open in.
 #define BOOK_WINDOW_BROWSE_SIZE "970x710"
 /// This macro will resolve to code that will open up the associated wiki page in the window.
-#define WIKI_PAGE_IFRAME(wikiurl, link_identifier) {"
-	<html>
+#define WIKI_PAGE_IFRAME(title, wikiurl, link_identifier) {"
+<html>
 	<head>
-	<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
-	<style>
-		iframe {
-			display: none;
-		}
-	</style>
+		<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
+		<title>[html_encode(title)]</title>
+		<style>
+			body {
+				margin: 0;
+			}
+			p {
+				margin: 8px;
+			}
+			iframe {
+				border: 0;
+				margin-left: -177px;
+				margin-top: -80px;
+				width: calc(100% + 177px);
+				height: calc(100% + 80px);
+				display: none;
+			}
+			body.loaded p {
+				display: none;
+			}
+			body.loaded iframe {
+				display: inline;
+			}
+		</style>
 	</head>
 	<body>
-	<script type="text/javascript">
-		function pageloaded(myframe) {
-			document.getElementById("loading").style.display = "none";
-			myframe.style.display = "inline";
-	}
-	</script>
-	<p id='loading'>You start skimming through the manual...</p>
-	<iframe width='100%' height='97%' onload="pageloaded(this)" src="[##wikiurl]/[##link_identifier]?printable=yes&remove_links=1" frameborder="0" id="main_frame"></iframe>
+		<p>You start skimming through the manual...</p>
+		<iframe src="[wikiurl]/[link_identifier]?useskin=vector" onload="document.body.classList.add('loaded')"></iframe>
 	</body>
-	</html>
-	"}
+</html>
+"}
 
 // A book that links to the wiki
 /obj/item/book/manual/wiki
@@ -43,7 +55,7 @@
 			return
 		DIRECT_OUTPUT(user, link("[wiki_url]/[page_link]"))
 	else
-		DIRECT_OUTPUT(user, browse(WIKI_PAGE_IFRAME(wiki_url, page_link), "window=manual;size=[BOOK_WINDOW_BROWSE_SIZE]")) // if you change this GUARANTEE that it works.
+		DIRECT_OUTPUT(user, browse(WIKI_PAGE_IFRAME(name, wiki_url, page_link), "window=manual;size=[BOOK_WINDOW_BROWSE_SIZE]")) // if you change this GUARANTEE that it works.
 
 /obj/item/book/manual/wiki/chemistry
 	name = "Chemistry Textbook"
diff --git a/code/modules/library/book.dm b/code/modules/library/book.dm
index be88edcf6d5..04283dbc7c3 100644
--- a/code/modules/library/book.dm
+++ b/code/modules/library/book.dm
@@ -86,7 +86,6 @@
 
 /// Proc that handles sending the book information to the user, as well as some housekeeping stuff.
 /obj/item/book/proc/display_content(mob/living/user)
-	credit_book_to_reader(user)
 	ui_interact(user)
 
 /// Proc that checks if the user is capable of reading the book, for UI interactions and otherwise. Returns TRUE if they can, FALSE if they can't.
@@ -125,6 +124,7 @@
 		return
 
 	user.visible_message(span_notice("[user] opens a book titled \"[book_data.title]\" and begins reading intently."))
+	credit_book_to_reader(user)
 	display_content(user)
 
 /obj/item/book/proc/is_carving_tool(obj/item/tool)
diff --git a/config/config.txt b/config/config.txt
index 11bbb603cda..855429fb823 100644
--- a/config/config.txt
+++ b/config/config.txt
@@ -196,7 +196,7 @@ IPINTEL_REJECT_BAD
 # FORUMURL http://tgstation13.org/phpBB/index.php
 
 ## Wiki address
-# WIKIURL http://tgstation13.org/wiki
+# WIKIURL https://wiki.tgstation13.org
 
 ## Rules address
 # RULESURL http://tgstation13.org/wiki/Rules
