diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt
index 80238bf106..b189903179 100644
--- a/data/language/en-GB.txt
+++ b/data/language/en-GB.txt
@@ -4315,9 +4315,10 @@ STR_6003    :Cut-away View
 STR_6004    :Enable cut-away view
 STR_6005    :Cut-away view only displays map elements at or below the cut height
 STR_6006    :Cut height
-STR_6007    :Select cut height
-STR_6008    :{COMMA2DP32}m
-STR_6009    :{COMMA1DP16}ft
+STR_6007    :Click to toggle raw value<->value in measurement units
+STR_6008    :Select cut height
+STR_6009    :{COMMA2DP32}m
+STR_6010    :{COMMA1DP16}ft
 
 #############
 # Scenarios #
diff --git a/src/openrct2/interface/Theme.cpp b/src/openrct2/interface/Theme.cpp
index bde4ab0b3e..4c419ce5f8 100644
--- a/src/openrct2/interface/Theme.cpp
+++ b/src/openrct2/interface/Theme.cpp
@@ -167,7 +167,7 @@ WindowThemeDesc WindowThemeDescriptors[] =
     { THEME_WC(WC_EDITOR_SCENARIO_BOTTOM_TOOLBAR), STR_THEMES_WINDOW_BOTTOM_TOOLBAR_SCENARIO_EDITOR,       COLOURS_3(TRANSLUCENT(COLOUR_LIGHT_BROWN), TRANSLUCENT(COLOUR_LIGHT_BROWN), TRANSLUCENT(COLOUR_MOSS_GREEN)                     ) },
     { THEME_WC(WC_TITLE_EDITOR),                   STR_TITLE_EDITOR_TITLE,       COLOURS_3(COLOUR_GREY,                     COLOUR_OLIVE_GREEN,              COLOUR_OLIVE_GREEN                                 ) },
     { THEME_WC(WC_TILE_INSPECTOR),                 STR_TILE_INSPECTOR_TITLE,       COLOURS_2(COLOUR_LIGHT_BLUE,               COLOUR_LIGHT_BLUE                                                                   ) },
-    { THEME_WC(WC_VIEW_CLIPPING),                 STR_TILE_INSPECTOR_TITLE,       COLOURS_1(COLOUR_LIGHT_BLUE                ) },
+    { THEME_WC(WC_VIEW_CLIPPING),                  STR_VIEW_CLIPPING_TITLE,       COLOURS_1(COLOUR_DARK_GREEN               ) },
     { THEME_WC(WC_CHANGELOG),                      STR_CHANGELOG_TITLE,       COLOURS_2(COLOUR_LIGHT_BLUE,               COLOUR_LIGHT_BLUE                                                                   ) },
     { THEME_WC(WC_MULTIPLAYER),                    STR_MULTIPLAYER,       COLOURS_3(COLOUR_LIGHT_BLUE,               COLOUR_LIGHT_BLUE,               COLOUR_LIGHT_BLUE                                  ) },
     { THEME_WC(WC_PLAYER),                         STR_THEMES_WINDOW_PLAYER,       COLOURS_3(COLOUR_LIGHT_BLUE,               COLOUR_LIGHT_BLUE,               COLOUR_LIGHT_BLUE                                  ) },
diff --git a/src/openrct2/interface/viewport.h b/src/openrct2/interface/viewport.h
index 23d3f54b46..1aa293f887 100644
--- a/src/openrct2/interface/viewport.h
+++ b/src/openrct2/interface/viewport.h
@@ -40,7 +40,7 @@ enum {
 	VIEWPORT_FLAG_INVISIBLE_SPRITES = (1 << 14),
 	VIEWPORT_FLAG_15 = (1 << 15),
 	VIEWPORT_FLAG_SEETHROUGH_PATHS = (1 << 16),
-	VIEWPORT_FLAG_PAINT_CLIP_TO_HEIGHT = (1 << 17)
+	VIEWPORT_FLAG_PAINT_CLIP_TO_HEIGHT = (1 << 17),
 };
 
 enum {
diff --git a/src/openrct2/localisation/string_ids.h b/src/openrct2/localisation/string_ids.h
index c8c5d87ce6..724a273b2a 100644
--- a/src/openrct2/localisation/string_ids.h
+++ b/src/openrct2/localisation/string_ids.h
@@ -3654,13 +3654,14 @@ enum {
 	STR_ENABLE_LIGHTING_EFFECTS = 6001,
 	STR_ENABLE_LIGHTING_EFFECTS_TIP = 6002,
 
-	STR_VIEW_CLIPPING = 6003,
+	STR_VIEW_CLIPPING_TITLE = 6003,
 	STR_VIEW_CLIPPING_HEIGHT_ENABLE = 6004,
 	STR_VIEW_CLIPPING_HEIGHT_ENABLE_TIP = 6005,
 	STR_VIEW_CLIPPING_HEIGHT_VALUE = 6006,
-	STR_VIEW_CLIPPING_HEIGHT_SCROLL_TIP = 6007,
-	STR_UNIT2DP_SUFFIX_METRES = 6008,
-	STR_UNIT1DP_SUFFIX_FEET = 6009,
+	STR_VIEW_CLIPPING_HEIGHT_VALUE_TOGGLE = 6007,
+	STR_VIEW_CLIPPING_HEIGHT_SCROLL_TIP = 6008,
+	STR_UNIT2DP_SUFFIX_METRES = 6009,
+	STR_UNIT1DP_SUFFIX_FEET = 6010,
 
 	// Have to include resource strings (from scenarios and objects) for the time being now that language is partially working
 	STR_COUNT = 32768
diff --git a/src/openrct2/windows/view_clipping.c b/src/openrct2/windows/view_clipping.c
index da3320a6f0..f306e54f44 100644
--- a/src/openrct2/windows/view_clipping.c
+++ b/src/openrct2/windows/view_clipping.c
@@ -34,20 +34,27 @@ enum WINDOW_VIEW_CLIPPING_WIDGET_IDX {
 	WIDX_CLIP_HEIGHT_SLIDER
 };
 
+typedef enum DISPLAY_TYPE {
+	DISPLAY_RAW = 0,
+	DISPLAY_UNITS = 1
+} clip_value_display_type;
+
+clip_value_display_type gClipHeightDisplayType = DISPLAY_UNITS;
+
 #pragma region Widgets
 
 #define WW 160
 #define WH 70
 
 rct_widget window_view_clipping_widgets[] = {
-	{ WWT_FRAME,           0,  0,       WW - 1, 0,      WH - 1, STR_NONE,                        STR_NONE }, // panel / background
-	{ WWT_CAPTION,         0,  1,       WW - 2, 1,      14,     STR_VIEW_CLIPPING,               STR_WINDOW_TITLE_TIP }, // title bar
-	{ WWT_CLOSEBOX,        0,  WW - 13, WW - 3, 2,      13,     STR_CLOSE_X,                     STR_CLOSE_WINDOW_TIP }, // close x button
-	{ WWT_CHECKBOX,        0,  11,      149,    19,     29,     STR_VIEW_CLIPPING_HEIGHT_ENABLE, STR_VIEW_CLIPPING_HEIGHT_ENABLE_TIP }, // clip height enable/disable check box
-	{ WWT_SPINNER,         0,  71,      130,    34,     45,     STR_NONE,                        STR_NONE }, // clip height value
-	{ WWT_DROPDOWN_BUTTON, 0,  119,      129,    35,     39,     STR_NUMERIC_UP,                  STR_NONE }, // clip height increase
-	{ WWT_DROPDOWN_BUTTON, 0,  119,      129,    40,     44,     STR_NUMERIC_DOWN,                STR_NONE }, // clip height decrease
-	{ WWT_SCROLL,          0,  11,      149,    49,     61,     SCROLL_HORIZONTAL,               STR_VIEW_CLIPPING_HEIGHT_SCROLL_TIP }, // clip height scrollbar
+	{ WWT_FRAME,		0,	0,		WW - 1,	0,	WH - 1, STR_NONE,				STR_NONE }, // panel / background
+	{ WWT_CAPTION,		0,	1,		WW - 2,	1,	14,     STR_VIEW_CLIPPING_TITLE,		STR_WINDOW_TITLE_TIP }, // title bar
+	{ WWT_CLOSEBOX,		0,	WW - 13,	WW - 3,	2,	13,     STR_CLOSE_X,				STR_CLOSE_WINDOW_TIP }, // close x button
+	{ WWT_CHECKBOX,		0,	11,		149,	19,	29,     STR_VIEW_CLIPPING_HEIGHT_ENABLE,	STR_VIEW_CLIPPING_HEIGHT_ENABLE_TIP }, // clip height enable/disable check box
+	{ WWT_SPINNER,		0,	90,		149,	34,	45,     STR_NONE,				STR_VIEW_CLIPPING_HEIGHT_VALUE_TOGGLE }, // clip height value
+	{ WWT_DROPDOWN_BUTTON,	0,	138,		148,	35,	39,     STR_NUMERIC_UP,				STR_NONE }, // clip height increase
+	{ WWT_DROPDOWN_BUTTON, 0,	138,		148,	40,	44,     STR_NUMERIC_DOWN,			STR_NONE }, // clip height decrease
+	{ WWT_SCROLL,          0,	11,		149,	49,	61,     SCROLL_HORIZONTAL,			STR_VIEW_CLIPPING_HEIGHT_SCROLL_TIP }, // clip height scrollbar
 	{ WIDGETS_END }
 };
 
@@ -126,6 +133,7 @@ void window_view_clipping_open()
 	window->widgets = window_view_clipping_widgets;
 	window->enabled_widgets = (1ULL << WIDX_CLOSE) |
 		(1ULL << WIDX_CLIP_HEIGHT_CHECKBOX) |
+		(1ULL << WIDX_CLIP_HEIGHT_VALUE) |
 		(1ULL << WIDX_CLIP_HEIGHT_INCREASE) |
 		(1ULL << WIDX_CLIP_HEIGHT_DECREASE) |
 		(1ULL << WIDX_CLIP_HEIGHT_SLIDER);
@@ -196,6 +204,11 @@ static void window_view_clipping_mouseup(rct_window *w, int widgetIndex)
 		if (mainWindow != NULL)
 			window_invalidate(mainWindow);
 		break;
+	case WIDX_CLIP_HEIGHT_VALUE:
+		// Toggle display of the cut height value in RAW vs UNITS
+		gClipHeightDisplayType = !gClipHeightDisplayType;
+		window_invalidate(w);
+		break;
 	}
 }
 
@@ -234,30 +247,35 @@ static void window_view_clipping_paint(rct_window *w, rct_drawpixelinfo *dpi)
 	window_draw_widgets(w, dpi);
 
 	// Clip height value
-	int x;
-	int y;
-	x = w->x + 8;
-	y = w->y + w->widgets[WIDX_CLIP_HEIGHT_VALUE].top;
+	sint32 x = w->x + 8;
+	sint32 y = w->y + w->widgets[WIDX_CLIP_HEIGHT_VALUE].top;
 	gfx_draw_string_left(dpi, STR_VIEW_CLIPPING_HEIGHT_VALUE, NULL, w->colours[0], x, y);
 
 	x = w->x + w->widgets[WIDX_CLIP_HEIGHT_VALUE].left + 1;
 	y = w->y + w->widgets[WIDX_CLIP_HEIGHT_VALUE].top;
-	//gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &gClipHeight, w->colours[0], x + 60, y); //Printing the raw value.
 
-	// Print the value in the configured measurement units.
 	fixed32_2dp clipHeightValueInMeters;
 	fixed16_1dp clipHeightValueInFeet;
-	switch (gConfigGeneral.measurement_format) {
-	case MEASUREMENT_FORMAT_METRIC:
-	case MEASUREMENT_FORMAT_SI:
-		clipHeightValueInMeters = (fixed32_2dp)(FIXED_2DP(gClipHeight, 0) / 2 * 1.5 - FIXED_2DP(10, 50));
-		gfx_draw_string_left(dpi, STR_UNIT2DP_SUFFIX_METRES, &clipHeightValueInMeters, w->colours[0], x, y);
-		break;
-	case MEASUREMENT_FORMAT_IMPERIAL:
+	switch (gClipHeightDisplayType) {
+	case DISPLAY_RAW:
 	default:
-		clipHeightValueInFeet = (fixed16_1dp)(FIXED_1DP(gClipHeight, 0) / 2.0 * 5 - FIXED_1DP(35, 0));
-		gfx_draw_string_left(dpi, STR_UNIT1DP_SUFFIX_FEET, &clipHeightValueInFeet, w->colours[0], x, y);
+		gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &gClipHeight, w->colours[0], x, y); //Printing the raw value.
 		break;
+
+	case DISPLAY_UNITS:
+		// Print the value in the configured measurement units.
+		switch (gConfigGeneral.measurement_format) {
+		case MEASUREMENT_FORMAT_METRIC:
+		case MEASUREMENT_FORMAT_SI:
+			clipHeightValueInMeters = (fixed32_2dp)(FIXED_2DP(gClipHeight, 0) / 2 * 1.5 - FIXED_2DP(10, 50));
+			gfx_draw_string_left(dpi, STR_UNIT2DP_SUFFIX_METRES, &clipHeightValueInMeters, w->colours[0], x, y);
+			break;
+		case MEASUREMENT_FORMAT_IMPERIAL:
+		default:
+			clipHeightValueInFeet = (fixed16_1dp)(FIXED_1DP(gClipHeight, 0) / 2.0 * 5 - FIXED_1DP(35, 0));
+			gfx_draw_string_left(dpi, STR_UNIT1DP_SUFFIX_FEET, &clipHeightValueInFeet, w->colours[0], x, y);
+			break;
+		}
 	}
 }