diff --git a/lib/model/model.go b/lib/model/model.go
index b6267a2f..35533392 100644
--- a/lib/model/model.go
+++ b/lib/model/model.go
@@ -330,6 +330,11 @@ func (m *Model) RemoveFolder(folder string) {
 	m.fmut.Lock()
 	m.pmut.Lock()
 
+	// Delete syncthing specific files
+	folderCfg := m.folderCfgs[folder]
+	folderPath := folderCfg.Path()
+	os.Remove(filepath.Join(folderPath, ".stfolder"))
+
 	m.tearDownFolderLocked(folder)
 	// Remove it from the database
 	db.DropFolder(m.db, folder)