diff --git a/qrenderdoc/Windows/ShaderViewer.cpp b/qrenderdoc/Windows/ShaderViewer.cpp
index 6d61e1c75..ad36199be 100644
--- a/qrenderdoc/Windows/ShaderViewer.cpp
+++ b/qrenderdoc/Windows/ShaderViewer.cpp
@@ -6639,6 +6639,7 @@ void ShaderViewer::on_toggleLog_clicked()
   {
     ui->docking->removeToolWindow(debugInfoLog);
     debugInfoLog = NULL;
+    ui->toggleLog->setChecked(false);
     return;
   }
 
@@ -6660,6 +6661,8 @@ void ShaderViewer::on_toggleLog_clicked()
                                                      ui->docking->areaOf(m_Scintillas.back())));
   ui->docking->setToolWindowProperties(
       debugInfoLog, ToolWindowManager::HideCloseButton | ToolWindowManager::DisallowFloatWindow);
+
+  ui->toggleLog->setChecked(true);
 }
 
 void ShaderViewer::on_resources_sortByStep_clicked()
diff --git a/qrenderdoc/Windows/ShaderViewer.ui b/qrenderdoc/Windows/ShaderViewer.ui
index 039db8b07..77157d757 100644
--- a/qrenderdoc/Windows/ShaderViewer.ui
+++ b/qrenderdoc/Windows/ShaderViewer.ui
@@ -304,6 +304,12 @@
       <property name="toolTip">
        <string>Show/Hide Debug Info Logging Panel</string>
       </property>
+      <property name="checkable">
+       <bool>true</bool>
+      </property>
+      <property name="text">
+       <string>Debug Info</string>
+      </property>
       <property name="icon">
        <iconset resource="../Resources/resources.qrc">
         <normaloff>:/information.png</normaloff>:/information.png</iconset>