diff --git a/lib/libclangmm b/lib/libclangmm
index 9567e2c..6282b51 160000
--- a/lib/libclangmm
+++ b/lib/libclangmm
@@ -1 +1 @@
-Subproject commit 9567e2cb4e04d0239f3989e94857408bba51bbc3
+Subproject commit 6282b516070757b5f28d0cc0c335c712446362ca
diff --git a/src/selection_dialog.cpp b/src/selection_dialog.cpp
index 9385f88..2e46f93 100644
--- a/src/selection_dialog.cpp
+++ b/src/selection_dialog.cpp
@@ -139,7 +139,7 @@ SelectionDialogBase::SelectionDialogBase(Source::BaseView *view_, const boost::o
 }
 
 SelectionDialogBase::~SelectionDialogBase() {
-#if defined(__APPLE__) && GTK_VERSION_GT_MICRO_CORRECTED(3, 24, 34)
+#if defined(__APPLE__) && GTK_VERSION_GT_MICRO_CORRECTED(3, 24, 34) && !GTK_VERSION_GT_MICRO_CORRECTED(3, 24, 37)
   // Workaround for https://gitlab.gnome.org/GNOME/gtk/-/issues/5593 by keeping window alive slightly longer
   window.close();
   Glib::signal_timeout().connect([window = std::make_shared<Gtk::Window>(std::move(window))] { return false; }, 5000);
diff --git a/src/tooltips.cpp b/src/tooltips.cpp
index edaebbf..1643666 100644
--- a/src/tooltips.cpp
+++ b/src/tooltips.cpp
@@ -19,7 +19,7 @@ Tooltip::Tooltip(std::function<void(Tooltip &)> set_buffer_)
     : view(nullptr), set_buffer(std::move(set_buffer_)) {}
 
 Tooltip::~Tooltip() {
-#if defined(__APPLE__) && GTK_VERSION_GT_MICRO_CORRECTED(3, 24, 34)
+#if defined(__APPLE__) && GTK_VERSION_GT_MICRO_CORRECTED(3, 24, 34) && !GTK_VERSION_GT_MICRO_CORRECTED(3, 24, 37)
   // Workaround for https://gitlab.gnome.org/GNOME/gtk/-/issues/5593 by keeping window alive slightly longer
   if(window) {
     window->close();