diff --git a/src/ngscopeclient/CreateFilterBrowser.cpp b/src/ngscopeclient/CreateFilterBrowser.cpp
index 57b025bf..ea97e72a 100644
--- a/src/ngscopeclient/CreateFilterBrowser.cpp
+++ b/src/ngscopeclient/CreateFilterBrowser.cpp
@@ -221,8 +221,9 @@ bool CreateFilterBrowser::DoRender()
 			DrawIconButton(draw_list, pos, color, icon, caption);
 		}
 
-		ImGui::EndChild();
 	}
+	
+	ImGui::EndChild();
 
 	return true;
 }
diff --git a/src/ngscopeclient/MainWindow.cpp b/src/ngscopeclient/MainWindow.cpp
index d5348a38..ad7ff2fc 100644
--- a/src/ngscopeclient/MainWindow.cpp
+++ b/src/ngscopeclient/MainWindow.cpp
@@ -1930,8 +1930,9 @@ void MainWindow::RenderLoadWarningPopup()
 					ImGuiChildFlags_Borders | ImGuiChildFlags_ResizeY))
 			{
 				ImGui::Markdown( m_session.m_setupNotes.c_str(), m_session.m_setupNotes.length(), GetMarkdownConfig());
-				ImGui::EndChild();
 			}
+			
+			ImGui::EndChild();
 		}
 
 		//If we have config warnings, show them