diff --git a/lib/notational-velocity.coffee b/lib/notational-velocity.coffee
index 995b33d..e7877d1 100644
--- a/lib/notational-velocity.coffee
+++ b/lib/notational-velocity.coffee
@@ -47,7 +47,7 @@ module.exports =
     window.addEventListener('blur', handleBlur, true)
     @subscriptions.add new Disposable -> window.removeEventListener('blur', handleBlur, true)
 
-    @subscriptions.add atom.workspace.onWillDestroyPaneItem ({item}) => @autosave(item)
+    @subscriptions.add atom.workspace.onWillDestroyPaneItem ({item}) => @autosave(item) unless @autodelete(item)
 
   deactivate: ->
     @subscriptions.dispose()
@@ -70,6 +70,17 @@ module.exports =
     return unless path.extname(uri) in atom.config.get('nvatom.extensions')
     paneItem?.save?()
 
+  autodelete: (paneItem) ->
+    return false unless paneItem?.getURI?()?
+    uri = paneItem.getURI()
+    return false unless uri.indexOf(@rootDirectory) == 0
+    return false unless path.extname(uri) in atom.config.get('nvatom.extensions')
+    return false unless paneItem?.isEmpty()
+    fs.unlinkSync(uri)
+    noteName = uri.substring(@rootDirectory.length + 1)
+    atom.notifications.addInfo("Empty note #{noteName} is deleted.")
+    return true
+
   autosaveAll: ->
     @autosave(paneItem) for paneItem in atom.workspace.getPaneItems()