diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md
index c91b6526b68..8f747b3c0eb 100644
--- a/com.unity.render-pipelines.high-definition/CHANGELOG.md
+++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Fixed
 - Fixed probe volumes debug views.
+- Fixed issue displaying wrong debug mode in runtime debug menu UI.
 
 ## [10.2.0] - 2020-10-19
 
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Debug/DebugDisplay.cs b/com.unity.render-pipelines.high-definition/Runtime/Debug/DebugDisplay.cs
index dd4fb552690..771d1497cf9 100644
--- a/com.unity.render-pipelines.high-definition/Runtime/Debug/DebugDisplay.cs
+++ b/com.unity.render-pipelines.high-definition/Runtime/Debug/DebugDisplay.cs
@@ -1008,56 +1008,62 @@ void RegisterMaterialDebug()
         void RefreshDisplayStatsDebug<T>(DebugUI.Field<T> field, T value)
         {
             UnregisterDebugItems(k_PanelDisplayStats, m_DebugDisplayStatsItems);
-            RegisterDisplayStatsDebug();
 
             if (DebugManager.instance.displayRuntimeUI)
                 DebugManager.instance.ReDrawOnScreenDebug();
+
+            RegisterDisplayStatsDebug();
         }
 
         // For now we just rebuild the lighting panel if needed, but ultimately it could be done in a better way
         void RefreshLightingDebug<T>(DebugUI.Field<T> field, T value)
         {
             UnregisterDebugItems(k_PanelLighting, m_DebugLightingItems);
-            RegisterLightingDebug();
 
             if (DebugManager.instance.displayRuntimeUI)
                 DebugManager.instance.ReDrawOnScreenDebug();
+
+            RegisterLightingDebug();
         }
 
         void RefreshDecalsDebug<T>(DebugUI.Field<T> field, T value)
         {
             UnregisterDebugItems(k_PanelDecals, m_DebugDecalsAffectingTransparentItems);
-            RegisterDecalsDebug();
 
             if (DebugManager.instance.displayRuntimeUI)
                 DebugManager.instance.ReDrawOnScreenDebug();
+
+            RegisterDecalsDebug();
         }
 
         void RefreshRenderingDebug<T>(DebugUI.Field<T> field, T value)
         {
             UnregisterDebugItems(k_PanelRendering, m_DebugRenderingItems);
-            RegisterRenderingDebug();
 
             if (DebugManager.instance.displayRuntimeUI)
                 DebugManager.instance.ReDrawOnScreenDebug();
+
+            RegisterRenderingDebug();
         }
 
         void RefreshMaterialDebug<T>(DebugUI.Field<T> field, T value)
         {
             UnregisterDebugItems(k_PanelMaterials, m_DebugMaterialItems);
-            RegisterMaterialDebug();
 
             if (DebugManager.instance.displayRuntimeUI)
                 DebugManager.instance.ReDrawOnScreenDebug();
+
+            RegisterMaterialDebug();
         }
 
         void RefreshVolumeDebug<T>(DebugUI.Field<T> field, T value)
         {
             UnregisterDebugItems(k_PanelVolume, m_DebugVolumeItems);
-            RegisterVolumeDebug();
 
             if (DebugManager.instance.displayRuntimeUI)
                 DebugManager.instance.ReDrawOnScreenDebug();
+
+            RegisterVolumeDebug();
         }
 
         void RegisterLightingDebug()