diff --git a/renderdocui/Windows/TextureViewer.Designer.cs b/renderdocui/Windows/TextureViewer.Designer.cs
index 36edab432..f9939cd8c 100644
--- a/renderdocui/Windows/TextureViewer.Designer.cs
+++ b/renderdocui/Windows/TextureViewer.Designer.cs
@@ -1176,6 +1176,7 @@
             this.pixelContext.Size = new System.Drawing.Size(209, 121);
             this.pixelContext.TabIndex = 6;
             this.pixelContext.Paint += new System.Windows.Forms.PaintEventHandler(this.pixelContext_Paint);
+            this.pixelContext.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pixelContext_MouseClick);
             // 
             // debugPixelContext
             // 
diff --git a/renderdocui/Windows/TextureViewer.cs b/renderdocui/Windows/TextureViewer.cs
index 2907ccf8b..49315fc86 100644
--- a/renderdocui/Windows/TextureViewer.cs
+++ b/renderdocui/Windows/TextureViewer.cs
@@ -251,6 +251,7 @@ namespace renderdocui.Windows
             renderContainer.MouseMove += render_MouseMove;
 
             render.KeyHandler = render_KeyDown;
+            pixelContext.KeyHandler = render_KeyDown;
 
             rangeHistogram.RangeUpdated += new EventHandler<RangeHistogramEventArgs>(rangeHistogram_RangeUpdated);
 
@@ -2491,6 +2492,11 @@ namespace renderdocui.Windows
             UI_UpdateStatusText();
         }
 
+        private void pixelContext_MouseClick(object sender, MouseEventArgs e)
+        {
+            pixelContext.Focus();
+        }
+
         private void render_MouseClick(object sender, MouseEventArgs e)
         {
             render.Focus();