diff --git a/ajax-loader.gif b/ajax-loader.gif
new file mode 100644
index 0000000..58bfafe
Binary files /dev/null and b/ajax-loader.gif differ
diff --git a/index.shtml b/index.shtml
index 1d4f1e7..aa77896 100644
--- a/index.shtml
+++ b/index.shtml
@@ -5,21 +5,23 @@
 <title>GrepTweet</title>
 <link rel="stylesheet" type="text/css" href="style.css">
 <script>
-document.onunload = disableSubmit;
-function disableSubmit() {
-	document.getElementById("button").disabled = true;
-	}
+function submitPressed() {
+b = document.getElementById("b");
+b.disabled = true;
+b.innerHTML = '<img src="ajax-loader.gif">';
+document.forms.f.submit();
+}
 </script>
 </head>
 
 <body>
 
-<form action="create.cgi" method="get">
+<form name="f" action="create.cgi" method="get">
 <fieldset>
 <legend>Create or update a backup of your tweets, so you can grep them</legend>
 <p><label>Twitter username: <input type="text" name="id" required placeholder="kaihendry"></label></p>
 <p><input type="checkbox" name="o" />Try get older tweets, instead of newer tweets when updating</p>
-<input id="button" type="submit" value="Fetch tweets"/>
+<button id="b" onclick="submitPressed()">Fetch tweets</button>
 </fieldset>
 </form>
 
@@ -29,5 +31,6 @@ function disableSubmit() {
 updates and <a href="https://github.com/kaihendry/Greptweet">contribute to the
 	source on Github!</a></p>
 
+
 </body>
 </html>
