diff --git a/include/modules/upower/upower_tooltip.hpp b/include/modules/upower/upower_tooltip.hpp
index 05e9dcb3..bc99abed 100644
--- a/include/modules/upower/upower_tooltip.hpp
+++ b/include/modules/upower/upower_tooltip.hpp
@@ -2,6 +2,7 @@
 
 #include <libupower-glib/upower.h>
 
+#include <memory>
 #include <unordered_map>
 
 #include "gtkmm/box.h"
@@ -16,7 +17,7 @@ class UPowerTooltip : public Gtk::Window {
 
   const std::string getDeviceIcon(UpDeviceKind& kind);
 
-  Gtk::Box* contentBox;
+  std::unique_ptr<Gtk::Box> contentBox;
 
   uint iconSize;
   uint tooltipSpacing;
diff --git a/src/modules/upower/upower_tooltip.cpp b/src/modules/upower/upower_tooltip.cpp
index 45544bbc..1a653f85 100644
--- a/src/modules/upower/upower_tooltip.cpp
+++ b/src/modules/upower/upower_tooltip.cpp
@@ -9,11 +9,10 @@
 namespace waybar::modules::upower {
 UPowerTooltip::UPowerTooltip(uint iconSize_, uint tooltipSpacing_, uint tooltipPadding_)
     : Gtk::Window(),
+      contentBox(std::make_unique<Gtk::Box>(Gtk::ORIENTATION_VERTICAL)),
       iconSize(iconSize_),
       tooltipSpacing(tooltipSpacing_),
       tooltipPadding(tooltipPadding_) {
-  contentBox = new Gtk::Box(Gtk::ORIENTATION_VERTICAL);
-
   // Sets the Tooltip Padding
   contentBox->set_margin_top(tooltipPadding);
   contentBox->set_margin_bottom(tooltipPadding);