diff --git a/Source/Core/Resources/Actions.cfg b/Source/Core/Resources/Actions.cfg
index b4fff5b..e01c4e6 100644
--- a/Source/Core/Resources/Actions.cfg
+++ b/Source/Core/Resources/Actions.cfg
@@ -417,9 +417,9 @@ togglenightspath
 
 togglezoomtubes
 {
-	title = "Toggle Zoom Tube Waypoint Paths";
+	title = "Toggle Zoom Tube Paths";
 	category = "classic";
-	description = "Toggles zoom tube waypoint path rendering in classic modes.";
+	description = "Toggles zoom tube path rendering in classic modes.";
 	allowkeys = true;
 	allowmouse = false;
 	allowscroll = false;
diff --git a/Source/Core/Windows/MainForm.Designer.cs b/Source/Core/Windows/MainForm.Designer.cs
index a109c16..289c48a 100644
--- a/Source/Core/Windows/MainForm.Designer.cs
+++ b/Source/Core/Windows/MainForm.Designer.cs
@@ -1868,7 +1868,7 @@ namespace CodeImp.DoomBuilder.Windows
 			this.buttontogglezoomtubes.Name = "buttontogglezoomtubes";
 			this.buttontogglezoomtubes.Size = new System.Drawing.Size(23, 22);
 			this.buttontogglezoomtubes.Tag = "builder_togglezoomtubes";
-			this.buttontogglezoomtubes.Text = "Show Zoom Tube Waypoint Paths";
+			this.buttontogglezoomtubes.Text = "Show Zoom Tube Paths";
 			this.buttontogglezoomtubes.Click += new System.EventHandler(this.InvokeTaggedAction);
 			// 
 			// buttontogglepolypreview
@@ -2848,7 +2848,7 @@ namespace CodeImp.DoomBuilder.Windows
 			this.itemrenderzoomtubes.Name = "itemrenderzoomtubes";
 			this.itemrenderzoomtubes.Size = new System.Drawing.Size(215, 22);
 			this.itemrenderzoomtubes.Tag = "builder_togglezoomtubes";
-			this.itemrenderzoomtubes.Text = "Show Zoom Tube Waypoint Paths";
+			this.itemrenderzoomtubes.Text = "Show Zoom Tube Paths";
 			this.itemrenderzoomtubes.Click += new System.EventHandler(this.InvokeTaggedAction);
 			// 
 			// itemrenderpolypreview
diff --git a/Source/Core/Windows/MainForm.cs b/Source/Core/Windows/MainForm.cs
index de1f7e2..ceb1586 100644
--- a/Source/Core/Windows/MainForm.cs
+++ b/Source/Core/Windows/MainForm.cs
@@ -338,6 +338,17 @@ namespace CodeImp.DoomBuilder.Windows
 				geomergemodesitems[i].Enabled = isclassicmode;
 			}
 
+			// SRB2-related previews only matter in classic editing modes
+			if (General.Map.SRB2)
+			{
+				buttontogglenightspath.Enabled = isclassicmode;
+				buttontogglezoomtubes.Enabled = isclassicmode;
+				buttontogglepolypreview.Enabled = isclassicmode;
+				itemrendernightspath.Enabled = isclassicmode;
+				itemrenderzoomtubes.Enabled = isclassicmode;
+				itemrenderpolypreview.Enabled = isclassicmode;
+			}
+
 			UpdateEditMenu();
 			UpdatePrefabsMenu();
 		}
@@ -2903,7 +2914,7 @@ namespace CodeImp.DoomBuilder.Windows
 			General.Settings.RenderZoomtubes = !General.Settings.RenderZoomtubes;
 			itemrenderzoomtubes.Checked = General.Settings.RenderZoomtubes;
 			buttontogglezoomtubes.Checked = General.Settings.RenderZoomtubes;
-			General.Interface.DisplayStatus(StatusType.Action, "Zoom tube waypoint path rendering is " + (General.Settings.RenderZoomtubes ? "ENABLED" : "DISABLED"));
+			General.Interface.DisplayStatus(StatusType.Action, "Zoom tube path rendering is " + (General.Settings.RenderZoomtubes ? "ENABLED" : "DISABLED"));
 
 			// Redraw display to show changes
 			General.Interface.RedrawDisplay();