diff --git a/xonsh/built_ins.py b/xonsh/built_ins.py
index d985816e6..8eaec3341 100644
--- a/xonsh/built_ins.py
+++ b/xonsh/built_ins.py
@@ -54,6 +54,8 @@ class Env(MutableMapping):
             return self._detyped
         ctx = {}
         for key, val in self._d.items():
+            if callable(val):
+                continue
             if not isinstance(key, string_types):
                 key = str(key)
             if 'PATH' in key:
diff --git a/xonsh/shell.py b/xonsh/shell.py
index 705a1c373..0d7273c6a 100644
--- a/xonsh/shell.py
+++ b/xonsh/shell.py
@@ -181,8 +181,7 @@ class Shell(Cmd):
             p = env['PROMPT']
             if callable(p):
                 p = p()
-            else:
-                p = format_prompt(p)
+            p = format_prompt(p)
         else:
             p = "set '$PROMPT = ...' $ "
         self.settitle()