diff --git a/qrenderdoc/Windows/BufferViewer.cpp b/qrenderdoc/Windows/BufferViewer.cpp
index 7c7e9cfa9..237655474 100644
--- a/qrenderdoc/Windows/BufferViewer.cpp
+++ b/qrenderdoc/Windows/BufferViewer.cpp
@@ -1133,6 +1133,18 @@ private:
       else
         ret = Formatter::Format(i);
     }
+    else if(vt == QMetaType::ULongLong)
+    {
+      ret = Formatter::Format(v.toULongLong(), el.hex);
+    }
+    else if(vt == QMetaType::LongLong)
+    {
+      int64_t i = v.toLongLong();
+      if(i >= 0)
+        ret = lit(" ") + Formatter::Format(i);
+      else
+        ret = Formatter::Format(i);
+    }
     else
     {
       ret = v.toString();