diff --git a/qrenderdoc/Windows/TextureViewer.cpp b/qrenderdoc/Windows/TextureViewer.cpp
index c366589dd..301e2313e 100644
--- a/qrenderdoc/Windows/TextureViewer.cpp
+++ b/qrenderdoc/Windows/TextureViewer.cpp
@@ -3277,6 +3277,10 @@ void TextureViewer::AutoFitRange()
       {
         fmt.compType = CompType::Float;
       }
+      if(fmt.compType == CompType::Typeless && m_TexDisplay.typeHint == CompType::UInt)
+        fmt.compType = CompType::UInt;
+      if(fmt.compType == CompType::Typeless && m_TexDisplay.typeHint == CompType::SInt)
+        fmt.compType = CompType::SInt;
 
       for(int i = 0; i < 4; i++)
       {