diff --git a/common/lib/calc/calc/preview.py b/common/lib/calc/calc/preview.py
index b800b7604b..f06176b662 100644
--- a/common/lib/calc/calc/preview.py
+++ b/common/lib/calc/calc/preview.py
@@ -111,7 +111,13 @@ def enrich_varname(varname):
     """
     greek = ("alpha beta gamma delta epsilon varepsilon zeta eta theta "
              "vartheta iota kappa lambda mu nu xi pi rho sigma tau upsilon "
-             "phi varphi chi psi omega").split()
+             "phi varphi chi psi omega hbar").split()
+
+    # add capital greek letters
+    greek += [x.capitalize() for x in greek]
+
+    # add hbar for QM
+    greek.append('hbar')
 
     if varname in greek:
         return ur"\{letter}".format(letter=varname)