diff --git a/rtv/__main__.py b/rtv/__main__.py
index c4ef8db..994db2c 100644
--- a/rtv/__main__.py
+++ b/rtv/__main__.py
@@ -106,13 +106,16 @@ def main():
         _logger.info('%s, %s', sys.executable, sys.version)
         env = [
             ('$DISPLAY', os.getenv('DISPLAY')),
+            ('$TERM', os.getenv('TERM')),
             ('$XDG_CONFIG_HOME', os.getenv('XDG_CONFIG_HOME')),
+            ('$RTV_EDITOR', os.getenv('RTV_EDITOR')),
+            ('$RTV_URLVIEWER', os.getenv('RTV_URLVIEWER')),
+            ('$RTV_BROWSER', os.getenv('RTV_BROWSER')),
             ('$BROWSER', os.getenv('BROWSER')),
             ('$PAGER', os.getenv('PAGER')),
-            ('$RTV_EDITOR', os.getenv('RTV_EDITOR')),
-            ('$RTV_URLVIEWER', os.getenv('RTV_URLVIEWER'))]
+            ('$VISUAL', os.getenv('VISUAL')),
+            ('$EDITOR', os.getenv('EDITOR'))]
         _logger.info('Environment: %s', env)
-
     else:
         # Add an empty handler so the logger doesn't complain
         logging.root.addHandler(logging.NullHandler())
diff --git a/rtv/terminal.py b/rtv/terminal.py
index 3ed9e64..eadec67 100644
--- a/rtv/terminal.py
+++ b/rtv/terminal.py
@@ -569,7 +569,10 @@ class Terminal(object):
             fp.write(data)
         _logger.info('File created: %s', filepath)
 
-        editor = os.getenv('RTV_EDITOR') or os.getenv('EDITOR') or 'nano'
+        editor = (os.getenv('RTV_EDITOR') or
+                  os.getenv('VISUAL') or
+                  os.getenv('EDITOR') or
+                  'nano')
         command = shlex.split(editor) + [filepath]
         try:
             with self.suspend():