diff --git a/src/app/webide/webide.component.html b/src/app/webide/webide.component.html
index 626cbfd..a85de03 100644
--- a/src/app/webide/webide.component.html
+++ b/src/app/webide/webide.component.html
@@ -9,7 +9,7 @@
   </button>
 </div>
 
-<div (keypress)="setButtonStateDirty()"
+<div (keypress)="setButtonStateDirty(); resetAutoSaveCountdown()"
   ace-editor
   [(text)]="code"
   [mode]="language"
diff --git a/src/app/webide/webide.component.ts b/src/app/webide/webide.component.ts
index 6c95f4f..bfe925d 100644
--- a/src/app/webide/webide.component.ts
+++ b/src/app/webide/webide.component.ts
@@ -34,6 +34,7 @@ export class WebideComponent implements OnInit {
   theme = 'monokai';
   files: string[];
   saveButtonState = 'SAVED';
+  autosave = null;
   command_handlers = { 'reload': this.reloadHandler.bind(this),
                        'read': this.readHandler.bind(this),
                        'select': this.selectHandler.bind(this),
@@ -49,7 +50,7 @@ export class WebideComponent implements OnInit {
     this.requestCode();
     this.processManagerService.init();
     this.processManagerService.subscribeCallback('login', (event) => { this.setButtonStateSaved(); });
-    setInterval(() => { this.sendCodeIfDirty(); }, autosave_interval);
+    this.resetAutoSaveCountdown();
   }
 
   subscribeWS() {
@@ -79,6 +80,13 @@ export class WebideComponent implements OnInit {
     this.saveButtonState = 'SAVED';
   }
 
+  resetAutoSaveCountdown() {
+    if (this.autosave) {
+      clearInterval(this.autosave);
+    }
+    this.autosave = setInterval(() => { this.sendCodeIfDirty(); }, autosave_interval);
+  }
+
   tabSwitchButtonHandler(file) {
     if (this.saveButtonState === 'DIRTY') {
       this.sendCodeContents();