diff --git a/external/imgui b/external/imgui
index 81160fee..c6e0284a 160000
--- a/external/imgui
+++ b/external/imgui
@@ -1 +1 @@
-Subproject commit 81160fee56027226bc80b48e196d0332f5541a8c
+Subproject commit c6e0284ac58b3f205c95365478888f7b53b077e2
diff --git a/scwx-qt/source/scwx/qt/util/imgui.cpp b/scwx-qt/source/scwx/qt/util/imgui.cpp
index 46bc859e..64076dab 100644
--- a/scwx-qt/source/scwx/qt/util/imgui.cpp
+++ b/scwx-qt/source/scwx/qt/util/imgui.cpp
@@ -32,11 +32,13 @@ void ImGui::DrawTooltip(const std::string& hoverText)
    auto tooltipFont = manager::FontManager::Instance().GetImGuiFont(
       types::FontCategory::Tooltip);
 
-   ::ImGui::BeginTooltip();
-   ::ImGui::PushFont(tooltipFont->font());
-   ::ImGui::TextUnformatted(hoverText.c_str());
-   ::ImGui::PopFont();
-   ::ImGui::EndTooltip();
+   if (::ImGui::BeginTooltip())
+   {
+      ::ImGui::PushFont(tooltipFont->font());
+      ::ImGui::TextUnformatted(hoverText.c_str());
+      ::ImGui::PopFont();
+      ::ImGui::EndTooltip();
+   }
 }
 
 ImGui& ImGui::Instance()