diff --git a/system/atom/iso8601-timestamp-mod/lib/iso8601-timestamp.coffee b/system/atom/iso8601-timestamp-mod/lib/iso8601-timestamp.coffee
index 51e94c6..b6f7ef2 100644
--- a/system/atom/iso8601-timestamp-mod/lib/iso8601-timestamp.coffee
+++ b/system/atom/iso8601-timestamp-mod/lib/iso8601-timestamp.coffee
@@ -1,5 +1,6 @@
 Iso8601TimestampView = require './iso8601-timestamp-view'
 {CompositeDisposable} = require 'atom'
+{TextEditor} = require 'atom'
 
 module.exports = Iso8601Timestamp =
 
@@ -9,12 +10,26 @@ module.exports = Iso8601Timestamp =
 
   iso: ->
     editor = atom.workspace.getActivePaneItem()
+
+    #then, maybe 'new file/ new folder' dialog??
+    if editor instanceof TextEditor == false
+      panels = atom.workspace.panelContainers.modal.panels
+      last = panels[panels.length - 1]
+      editor = last.item.miniEditor
+
     moment = require 'moment'
     iso_time = moment().format('YYYYMMDDTHHmmssZZ_')
     editor.insertText(iso_time)
 
   local: ->
     editor = atom.workspace.getActivePaneItem()
+
+    #then, maybe 'new file/ new folder' dialog??
+    if editor instanceof TextEditor == false
+      panels = atom.workspace.panelContainers.modal.panels
+      last = panels[panels.length - 1]
+      editor = last.item.miniEditor
+
     moment = require 'moment'
     local_time = moment().format('YYYY/MM/DD, HH:mm:ss, ZZ')
     editor.insertText(local_time)