diff --git a/src/components/editor/editor.html b/src/components/editor/editor.html
index 4995d182..dd6a04ca 100644
--- a/src/components/editor/editor.html
+++ b/src/components/editor/editor.html
@@ -9,7 +9,11 @@
                 <label class="control-label sr-only" for="editor-font-size">font size (in pixels)</label>
                 <input data-bind="value: prefs.fontSize" id="editor-font-size" type="number" class="form-control input-sm">
             </div>
-            <div class="col-md-2"></div>
+            <div class="col-md-2">
+                <button id="current-code-btn" type="button" class="btn btn-default btn-sm center-block">
+                    <span class="glyphicon glyphicon-file"></span> <span class="file-name" data-bind="text: currentFileName">untitled</span>
+                </button>
+            </div>
             <div class="col-md-2">
                 <button id="autoindent-code-btn" type="button" class="btn btn-default btn-sm center-block">
                     <span class="glyphicon glyphicon-indent-left"></span> Indent code
diff --git a/src/components/editor/editor.js b/src/components/editor/editor.js
index 0b2fe848..c78fc0e0 100644
--- a/src/components/editor/editor.js
+++ b/src/components/editor/editor.js
@@ -19,6 +19,8 @@ class Editor {
         prefs.fontSize = params.fontSize;
         this.prefs = prefs;
 
+        this.currentFileName = SysGlobalObservables.currentFileName;
+
         this.availableThemes = ko.observableArray(['monokai', 'terminal', 'tomorrow', 'xcode']);
 
         this.annotations = params.annotations;
@@ -43,8 +45,8 @@ class Editor {
 
         $('#download-file-btn').click(() => {
             var text = this.getText();
-            var blob = new Blob([text], {type: 'text/plain;charset=utf-8'});
-            saveAs(blob, 'program.c');
+            var blob = new Blob([text]);
+            saveAs(blob, SysGlobalObservables.currentFileName());
         });
 
         $('#autoindent-code-btn').click(() => {