diff --git a/static/js/websockets.js b/static/js/websockets.js
index 6e2f20d..6662f27 100644
--- a/static/js/websockets.js
+++ b/static/js/websockets.js
@@ -8,6 +8,7 @@ $(document).ready(function() {
   $('#emit').keyup(function() {
     clearTimeout(typingTimer);
     clearInterval(updateInterval);
+    $('#saveInfo').removeClass().addClass("glyphicon glyphicon-floppy-remove");
     typingTimer = setTimeout(doneTyping, doneTypingInterval);
   });
 
@@ -15,6 +16,7 @@ $(document).ready(function() {
   $('#emit').keydown(function() {
     clearTimeout(typingTimer);
     clearInterval(updateInterval);
+    $('#saveInfo').removeClass().addClass("glyphicon glyphicon-floppy-remove");
     document.title = "[UNSAVED] " + title_name;
   });
 
@@ -22,6 +24,7 @@ $(document).ready(function() {
   function doneTyping() {
     payload = JSON.stringify({ TextData: $('#emit_data').val(), Title: title_name, UpdateServer: true, UpdateClient: false })
     send(payload)
+    $('#saveInfo').removeClass().addClass("glyphicon glyphicon-floppy-save");
     console.log("Done typing")
     updateInterval = setInterval(updateText, pollToGetNewestCopyInterval);
     document.title = "[SAVED] " + title_name;
@@ -50,6 +53,11 @@ $(document).ready(function() {
       $('#emit_data').val(data.TextData)
       document.title = "[LOADED] " + title_name;
     }
+    console.log((data.TextData == "saved"))
+    console.log(data.TextData)
+    if (data.TextData == "saved") {
+      $('#saveInfo').removeClass().addClass("glyphicon glyphicon-floppy-saved");
+    }
     console.log(data)
   }
 
diff --git a/templates/index.tmpl b/templates/index.tmpl
index 79d918d..56510c3 100644
--- a/templates/index.tmpl
+++ b/templates/index.tmpl
@@ -55,7 +55,7 @@
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </button>
-        <a class="navbar-brand" href="/">{{ .WikiName }}</a>
+        <a class="navbar-brand" href="/">{{ .WikiName }} &nbsp;<span id="saveInfo" class="glyphicon" aria-hidden="true"></span></a>
       </div>
       <div id="navbar" class="collapse navbar-collapse">
         <ul class="nav navbar-nav">
diff --git a/websockets.go b/websockets.go
index 37f73fb..f05d728 100644
--- a/websockets.go
+++ b/websockets.go
@@ -50,6 +50,7 @@ func wshandler(w http.ResponseWriter, r *http.Request) {
 			if err != nil {
 				panic(err)
 			}
+			m.TextData = "saved"
 		}
 		if m.UpdateClient {
 			m.UpdateClient = len(m.TextData) != len(p.CurrentText)