diff --git a/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs b/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs
index 5fb00a5fd3f1a19bad3338c94eec6a6b5ba1b3c1..f534b739feaec9b8fd69678c68d19bd4c1f902b8 100755
--- a/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs
+++ b/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs
@@ -165,10 +165,10 @@ namespace CodeImp.DoomBuilder.BuilderModes
 			General.Interface.AddButton(BuilderPlug.Me.MenusForm.AlignThingsToWall); //mxd
 
 			//mxd. Add radii buttons/items...
-			General.Interface.AddButton(BuilderPlug.Me.MenusForm.ButtonLightRadii, ToolbarSection.Helpers);
-			General.Interface.AddButton(BuilderPlug.Me.MenusForm.ButtonSoundRadii, ToolbarSection.Helpers);
-			General.Interface.AddMenu(BuilderPlug.Me.MenusForm.ItemLightRadii, MenuSection.ViewHelpers);
-			General.Interface.AddMenu(BuilderPlug.Me.MenusForm.ItemSoundRadii, MenuSection.ViewHelpers);
+			if (General.Map.Config.DynamicLightSupport) General.Interface.AddButton(BuilderPlug.Me.MenusForm.ButtonLightRadii, ToolbarSection.Helpers);
+			if (General.Map.Config.SoundSupport) General.Interface.AddButton(BuilderPlug.Me.MenusForm.ButtonSoundRadii, ToolbarSection.Helpers);
+			if (General.Map.Config.DynamicLightSupport) General.Interface.AddMenu(BuilderPlug.Me.MenusForm.ItemLightRadii, MenuSection.ViewHelpers);
+			if (General.Map.Config.SoundSupport) General.Interface.AddMenu(BuilderPlug.Me.MenusForm.ItemSoundRadii, MenuSection.ViewHelpers);
 			General.Interface.EndToolbarUpdate(); //mxd
 			
 			// Convert geometry selection to linedefs selection
@@ -196,10 +196,10 @@ namespace CodeImp.DoomBuilder.BuilderModes
 			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.AlignThingsToWall); //mxd
 
 			//mxd. Remove radii buttons/items...
-			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.ButtonLightRadii);
-			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.ButtonSoundRadii);
-			General.Interface.RemoveMenu(BuilderPlug.Me.MenusForm.ItemLightRadii);
-			General.Interface.RemoveMenu(BuilderPlug.Me.MenusForm.ItemSoundRadii);
+			if (General.Map.Config.DynamicLightSupport) General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.ButtonLightRadii);
+			if (General.Map.Config.SoundSupport) General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.ButtonSoundRadii);
+			if (General.Map.Config.DynamicLightSupport) General.Interface.RemoveMenu(BuilderPlug.Me.MenusForm.ItemLightRadii);
+			if (General.Map.Config.SoundSupport) General.Interface.RemoveMenu(BuilderPlug.Me.MenusForm.ItemSoundRadii);
 			General.Interface.EndToolbarUpdate(); //mxd
 
 			//mxd. Do some highlight management...