diff --git a/src/app/files/fileManager.js b/src/app/files/fileManager.js
index 7cb8206b53..6af34bb86b 100644
--- a/src/app/files/fileManager.js
+++ b/src/app/files/fileManager.js
@@ -5,6 +5,7 @@ const EventEmitter = require('events')
 var globalRegistry = require('../../global/registry')
 var CompilerImport = require('../compiler/compiler-imports')
 var toaster = require('../ui/tooltip')
+var helper = require('../../lib/helper.js')
 import { FileSystemApi } from 'remix-plugin'
 import * as packageJson from '../../../package.json'
 
@@ -136,19 +137,31 @@ class FileManager extends FileSystemApi {
   async setFile (path, content) {
     if (this.currentRequest) {
       let reject = false
-      let savedAsAnotherFile = false
+      let savedAsCopy = false
       let actions = (toaster) => {
         return yo`<div class="container ml-1">
-        <button class="btn btn-primary btn-sm m-1" onclick=${(e) => { reject = true; e.target.innerHTML = 'Canceled'; toaster.hide() }}>Cancel</button>
         <button class="btn btn-primary btn-sm m-1" onclick=${(e) => {
-          if (savedAsAnotherFile) return
-          savedAsAnotherFile = true
-          const newPath = path + '.' + this.currentRequest.from
-          this._setFileInternal(newPath, content)
-          this.switchFile(newPath)
+          reject = true;
+          e.target.innerHTML = 'Canceled';
+          toaster.hide()
+        }}>
+          Cancel
+        </button>
+        <button class="btn btn-primary btn-sm m-1" onclick=${(e) => {
+          if (savedAsCopy) return
+          savedAsCopy = true
+          const fileProvider = this.fileProviderOf(path)
+          if (!fileProvider) return
+          helper.createNonClashingNameWithPrefix(path, fileProvider, '', (error, newFile) => {
+            if (error) return modalDialogCustom.alert('Failed to create file. ' + newFile + ' ' + error)
+            if (!fileProvider.set(newFile, content)) return modalDialogCustom.alert('Failed to create a file ' + newFile)
+            this.switchFile(newFile)
+          })
           e.target.innerHTML = 'Saved'
           toaster.hide()
-        }}>Save As Copy</button>
+        }}>
+          Save As Copy
+        </button>
         </div>`
       }
       await toaster(yo`
@@ -159,7 +172,7 @@ class FileManager extends FileSystemApi {
           </span>
         </div>`, actions, { time: 4000 })
       if (reject) throw new Error(`set file operation on ${path} aborted by user.`)
-      if (savedAsAnotherFile) return
+      if (savedAsCopy) return
     }
     this._setFileInternal(path, content)
   }