diff --git a/.gitignore b/.gitignore
index 439279ac..e94ff721 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ analysis-build
 asan-build
 release-nodebug-build
 debug-noopt-build
+project/
+*.bak
diff --git a/lib b/lib
index 17d9e608..365ae684 160000
--- a/lib
+++ b/lib
@@ -1 +1 @@
-Subproject commit 17d9e6083e93c09e3c5099e1a37488debb045de1
+Subproject commit 365ae6845befac21a2b0c47f158410a67b20e7c9
diff --git a/src/ngscopeclient/ChannelPropertiesDialog.cpp b/src/ngscopeclient/ChannelPropertiesDialog.cpp
index ea582b19..3b87c739 100644
--- a/src/ngscopeclient/ChannelPropertiesDialog.cpp
+++ b/src/ngscopeclient/ChannelPropertiesDialog.cpp
@@ -540,6 +540,8 @@ bool ChannelPropertiesDialog::DoRender()
 		{
 			if(ImGui::CollapsingHeader(streamname.c_str()))
 			{
+				
+				ImGui::PushID(i);
 				auto unit = m_channel->GetYAxisUnits(i);
 
 				//If no change to offset in dialog, update our input value when we change offset outside the dialog
@@ -565,6 +567,7 @@ bool ChannelPropertiesDialog::DoRender()
 				ImGui::SetNextItemWidth(width);
 				if(UnitInputWithExplicitApply("Range", m_range[i], m_committedRange[i], unit))
 					ochan->SetVoltageRange(m_committedRange[i], i);
+				ImGui::PopID();
 			}
 		}
 	}
diff --git a/src/ngscopeclient/TriggerPropertiesDialog.cpp b/src/ngscopeclient/TriggerPropertiesDialog.cpp
index e05661ad..23b74d36 100644
--- a/src/ngscopeclient/TriggerPropertiesDialog.cpp
+++ b/src/ngscopeclient/TriggerPropertiesDialog.cpp
@@ -118,7 +118,8 @@ void TriggerPropertiesPage::Render(bool graphEditorMode)
 				m_committedTriggerOffset,
 				fs))
 			{
-				m_scope->SetTriggerOffset(off);
+				m_scope->SetTriggerOffset(/*off*/m_committedTriggerOffset);
+				updated = true;
 			}
 
 			Dialog::HelpMarker(
@@ -249,6 +250,9 @@ void TriggerPropertiesPage::Render(bool graphEditorMode)
 				//Skip trigger level as that's redundant
 				if(it->first == "Level")
 					continue;
+					
+				if(it->second.IsHidden())
+					continue;
 
 				if(FilterPropertiesDialog::DoParameter(it->second, it->first, m_paramTempValues))
 					updated = true;