diff --git a/js/inline-expanding.js b/js/inline-expanding.js
index e7360dce..195f92d6 100644
--- a/js/inline-expanding.js
+++ b/js/inline-expanding.js
@@ -10,7 +10,7 @@
  *
  */
 
-onload(function(){
+onready(function(){
 	var link = document.getElementsByTagName('a');
 	
 	for(var i = 0; i < link.length; i++) {
diff --git a/js/local-time.js b/js/local-time.js
index b81c324f..b92cc5be 100644
--- a/js/local-time.js
+++ b/js/local-time.js
@@ -10,7 +10,7 @@
  *
  */
 
-onload(function(){
+onready(function(){
 	var iso8601 = function(s) {
 		s = s.replace(/\.\d\d\d+/,""); // remove milliseconds
 		s = s.replace(/-/,"/").replace(/-/,"/");
diff --git a/templates/index.html b/templates/index.html
index ae94f92a..1e277256 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -53,5 +53,8 @@
 	{{ boardlist.bottom }}
 	<p class="unimportant" style="margin-top:20px;text-align:center;">Powered by <a href="http://tinyboard.org/">Tinyboard</a> {{ config.version }} | <a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2012 Tinyboard Development Group</p>
 	{% for footer in config.footer %}<p class="unimportant" style="text-align:center;">{{ footer }}</p>{% endfor %}
+	<script type="text/javascript">{% raw %}
+		ready();
+	{% endraw %}</script>
 </body>
 </html>
diff --git a/templates/main.js b/templates/main.js
index 0b514a80..3903ff6e 100644
--- a/templates/main.js
+++ b/templates/main.js
@@ -158,25 +158,18 @@ var RecaptchaOptions = {
 	theme : 'clean'
 };
 
-function onload(fnc) {
-	if(typeof window.addEventListener != "undefined") {
-		window.addEventListener("load", fnc, false);
-	} else if(typeof window.attachEvent != "undefined") {
-		window.attachEvent( "onload", fnc );
-	} else {
-		if (window.onload != null) {
-			var oldOnload = window.onload;
-			window.onload = function (e) {
-				oldOnload(e);
-				window[fnc]();
-			};
-		} else {
-			window.onload = fnc;
-		}
+onready_callbacks = [];
+function onready(fnc) {
+	onready_callbacks.push(fnc);
+}
+
+function ready() {
+	for(var i = 0; i < onready_callbacks.length; i++) {
+		onready_callbacks[i]();
 	}
 }
 
-onload(init);
+onready(init);
 
 {% endraw %}{% if config.google_analytics %}{% raw %}
 
diff --git a/templates/thread.html b/templates/thread.html
index 680bd004..dae51dd7 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -55,5 +55,8 @@
 	{{ boardlist.bottom }}
 	<p class="unimportant" style="margin-top:20px;text-align:center;">Powered by <a href="http://tinyboard.org/">Tinyboard</a> {{ config.version }} | <a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2012 Tinyboard Development Group</p>
 	{% for footer in config.footer %}<p class="unimportant" style="text-align:center;">{{ footer }}</p>{% endfor %}
+	<script type="text/javascript">{% raw %}
+		ready();
+	{% endraw %}</script>
 </body>
 </html>