diff --git a/gtk2_ardour/input_port_monitor.cc b/gtk2_ardour/input_port_monitor.cc
index 1620c90687..2f5797a8ac 100644
--- a/gtk2_ardour/input_port_monitor.cc
+++ b/gtk2_ardour/input_port_monitor.cc
@@ -46,6 +46,7 @@ InputPortMonitor::InputPortMonitor (ARDOUR::DataType dt, samplecnt_t sample_rate
 	, _audio_scope (0)
 	, _midi_meter (0)
 	, _midi_monitor (0)
+	, _orientation (o)
 {
 	if (o == Vertical) {
 		_box = new Gtk::HBox;
@@ -54,35 +55,10 @@ InputPortMonitor::InputPortMonitor (ARDOUR::DataType dt, samplecnt_t sample_rate
 	}
 
 	if (_dt == DataType::AUDIO) {
-		_audio_meter = new FastMeter (
-		    (uint32_t)floor (UIConfiguration::instance ().get_meter_hold ()),
-		    18,
-				o == Vertical ? FastMeter::Vertical : FastMeter::Horizontal,
-				PX_SCALE (200),
-		    UIConfiguration::instance ().color ("meter color0"),
-		    UIConfiguration::instance ().color ("meter color1"),
-		    UIConfiguration::instance ().color ("meter color2"),
-		    UIConfiguration::instance ().color ("meter color3"),
-		    UIConfiguration::instance ().color ("meter color4"),
-		    UIConfiguration::instance ().color ("meter color5"),
-		    UIConfiguration::instance ().color ("meter color6"),
-		    UIConfiguration::instance ().color ("meter color7"),
-		    UIConfiguration::instance ().color ("meter color8"),
-		    UIConfiguration::instance ().color ("meter color9"),
-		    UIConfiguration::instance ().color ("meter background bottom"),
-		    UIConfiguration::instance ().color ("meter background top"),
-		    0x991122ff, // red highlight gradient Bot
-		    0x551111ff, // red highlight gradient Top
-		    (115.0 * log_meter0dB (-18)),
-		    89.125,  // 115.0 * log_meter0dB(-9);
-		    106.375, // 115.0 * log_meter0dB(-3);
-		    115.0,   // 115.0 * log_meter0dB(0);
-		    (UIConfiguration::instance ().get_meter_style_led () ? 3 : 1));
+		setup_audio_meter ();
 
 		_audio_scope = new InputScope (sample_rate, PX_SCALE (200), 25, o);
 
-		_audio_meter->show ();
-
 		if (UIConfiguration::instance ().get_input_meter_scopes ()) {
 			_audio_scope->show ();
 		} else {
@@ -91,9 +67,12 @@ InputPortMonitor::InputPortMonitor (ARDOUR::DataType dt, samplecnt_t sample_rate
 
 		ArdourWidgets::set_tooltip (_audio_scope, _("5 second history waveform"));
 
-		_box->pack_start (*_audio_meter, false, false);
+		_box->pack_start (_bin, false, false);
 		_box->pack_start (*_audio_scope, true, true, 1);
 
+		UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &InputPortMonitor::parameter_changed));
+		UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &InputPortMonitor::color_handler));
+
 	} else if (_dt == DataType::MIDI) {
 		_midi_meter   = new EventMeter (o);
 		_midi_monitor = new EventMonitor (o);
@@ -124,6 +103,29 @@ InputPortMonitor::~InputPortMonitor ()
 	delete _box;
 }
 
+void
+InputPortMonitor::parameter_changed (std::string const& p)
+{
+	if (_audio_scope) {
+		_audio_scope->parameter_changed (p);
+	}
+	if (_audio_meter) {
+		if (p == "meter-hold") {
+			_audio_meter->set_hold_count ((uint32_t) floor(UIConfiguration::instance().get_meter_hold()));
+		} else if (p == "meter-style-led") {
+			setup_audio_meter ();
+		}
+	}
+}
+
+void
+InputPortMonitor::color_handler ()
+{
+	if (_audio_meter) {
+		setup_audio_meter ();
+	}
+}
+
 void
 InputPortMonitor::clear ()
 {
@@ -141,6 +143,43 @@ InputPortMonitor::clear ()
 	}
 }
 
+void
+InputPortMonitor::setup_audio_meter ()
+{
+	_bin.remove ();
+	delete _audio_meter;
+
+	_audio_meter = new FastMeter (
+			(uint32_t)floor (UIConfiguration::instance ().get_meter_hold ()),
+			18,
+			_orientation == Vertical ? FastMeter::Vertical : FastMeter::Horizontal,
+			PX_SCALE (200),
+			UIConfiguration::instance ().color ("meter color0"),
+			UIConfiguration::instance ().color ("meter color1"),
+			UIConfiguration::instance ().color ("meter color2"),
+			UIConfiguration::instance ().color ("meter color3"),
+			UIConfiguration::instance ().color ("meter color4"),
+			UIConfiguration::instance ().color ("meter color5"),
+			UIConfiguration::instance ().color ("meter color6"),
+			UIConfiguration::instance ().color ("meter color7"),
+			UIConfiguration::instance ().color ("meter color8"),
+			UIConfiguration::instance ().color ("meter color9"),
+			UIConfiguration::instance ().color ("meter background bottom"),
+			UIConfiguration::instance ().color ("meter background top"),
+			0x991122ff, // red highlight gradient Bot
+			0x551111ff, // red highlight gradient Top
+			(115.0 * log_meter0dB (-18)),
+			89.125,  // 115.0 * log_meter0dB(-9);
+			106.375, // 115.0 * log_meter0dB(-3);
+			115.0,   // 115.0 * log_meter0dB(0);
+			(UIConfiguration::instance ().get_meter_style_led () ? 3 : 1));
+
+	_bin.add (*_audio_meter);
+	_bin.show ();
+	_audio_meter->show ();
+}
+
+
 void
 InputPortMonitor::update (float l, float p)
 {
@@ -181,7 +220,6 @@ InputPortMonitor::InputScope::InputScope (samplecnt_t rate, int l, int g, Orient
 	_surface = Cairo::ImageSurface::create (Cairo::FORMAT_ARGB32, l, g);
 	use_image_surface (false); /* we already use a surface */
 
-	UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &InputScope::parameter_changed));
 	parameter_changed ("waveform-clip-level");
 	parameter_changed ("show-waveform-clipping");
 	parameter_changed ("waveform-scale");
diff --git a/gtk2_ardour/input_port_monitor.h b/gtk2_ardour/input_port_monitor.h
index 0c3eeef336..7b436d7746 100644
--- a/gtk2_ardour/input_port_monitor.h
+++ b/gtk2_ardour/input_port_monitor.h
@@ -20,6 +20,7 @@
 #define __gtk_ardour_input_port_monitor_h__
 
 #include <gtkmm/box.h>
+#include <gtkmm/alignment.h>
 
 #include "gtkmm2ext/cairo_widget.h"
 
@@ -55,6 +56,7 @@ private:
 		InputScope (ARDOUR::samplecnt_t, int length , int gauge, Orientation);
 		void update (ARDOUR::CircularSampleBuffer&);
 		void clear ();
+		void parameter_changed (std::string const&);
 
 	protected:
 		void render (Cairo::RefPtr<Cairo::Context> const&, cairo_rectangle_t*);
@@ -62,7 +64,6 @@ private:
 		void on_size_allocate (Gtk::Allocation&);
 
 	private:
-		void parameter_changed (std::string const&);
 
 		int                 _pos;
 		ARDOUR::samplecnt_t _rate;
@@ -118,12 +119,18 @@ private:
 		Orientation                            _orientation;
 	};
 
+	void setup_audio_meter ();
+	void color_handler ();
+	void parameter_changed (std::string const&);
+
 	Gtk::Box*                 _box;
+	Gtk::Alignment            _bin;
 	ARDOUR::DataType          _dt;
 	ArdourWidgets::FastMeter* _audio_meter;
 	InputScope*               _audio_scope;
 	EventMeter*               _midi_meter;
 	EventMonitor*             _midi_monitor;
+	Orientation               _orientation;
 };
 
 #endif