diff --git a/index.html b/index.html
index 039c3fa..1277e2a 100755
--- a/index.html
+++ b/index.html
@@ -328,6 +328,7 @@ function updateGutters(cm) {
 
       $("#font-info p").hide();
       $("." + font).show();
+      updateHash();
     }
 
     function setSize() {
@@ -340,7 +341,15 @@ function updateGutters(cm) {
         $(".CodeMirror").addClass("no-smooth");
       }
     }
-
+    function updateHash(){
+      var newHash = '#' + $("#select-font").val();
+      if(history.pushState) {
+        history.pushState(null, null, newHash);
+      }
+      else {
+        location.hash = newHash;
+      }
+    }
     $(document).ready(function(){
 
       //randomly select a theme
@@ -376,7 +385,14 @@ function updateGutters(cm) {
           custom: { families: font_aliases }
         });
 
-        $("#select-font").val('input'); // default to this awesome font
+        var hash = window.location.hash.substring(1);
+        if(hash){
+          $("#select-font").val(hash);
+        }
+        else {
+          $("#select-font").val('input'); // default to this awesome font
+        }
+
         selectFont();
       });
     });