diff --git a/common/lib/calc/calc/preview.py b/common/lib/calc/calc/preview.py
index b800b7604b..3f0e745c59 100644
--- a/common/lib/calc/calc/preview.py
+++ b/common/lib/calc/calc/preview.py
@@ -113,6 +113,12 @@ def enrich_varname(varname):
              "vartheta iota kappa lambda mu nu xi pi rho sigma tau upsilon "
              "phi varphi chi psi omega").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)
     else: