diff --git a/src/Application/Application.cpp b/src/Application/Application.cpp
index b868c93..01764aa 100644
--- a/src/Application/Application.cpp
+++ b/src/Application/Application.cpp
@@ -402,8 +402,7 @@ Application::drawHelpMarker(Containers::StringView text, float wrap_pos) {
 
 void
 Application::drawTooltip(Containers::StringView text, float wrap_pos) {
-    if(ImGui::IsItemHovered()){
-        ImGui::BeginTooltip();
+    if(ImGui::IsItemHovered() && ImGui::BeginTooltip()) {
         if(wrap_pos > 0.0f) {
             ImGui::PushTextWrapPos(wrap_pos);
         }
diff --git a/src/Application/Application_ProfileManager.cpp b/src/Application/Application_ProfileManager.cpp
index 5f77c59..e314ffe 100644
--- a/src/Application/Application_ProfileManager.cpp
+++ b/src/Application/Application_ProfileManager.cpp
@@ -267,8 +267,7 @@ Application::drawBackupListPopup() {
 
             ImGui::TableSetColumnIndex(0);
             ImGui::TextUnformatted(backup.company.cbegin(), backup.company.cend());
-            if(ImGui::IsItemHovered()) {
-                ImGui::BeginTooltip();
+            if(ImGui::IsItemHovered() && ImGui::BeginTooltip()) {
                 for(const auto& file : backup.includedFiles) {
                     ImGui::TextUnformatted(file.cbegin());
                 }