diff --git a/man/waybar-custom.5.scd b/man/waybar-custom.5.scd
index 67e4c89c..4c219031 100644
--- a/man/waybar-custom.5.scd
+++ b/man/waybar-custom.5.scd
@@ -107,6 +107,11 @@ Addressed by *custom/<name>*
 	default: true ++
 	Option to disable tooltip on hover.
 
+*tooltip-format*: ++
+	typeof: string ++
+	The tooltip format. If specified, overrides any tooltip output from the script in *exec*. ++
+	Uses the same format replacements as *format*.
+
 *escape*: ++
 	typeof: bool ++
 	default: false ++
diff --git a/src/modules/custom.cpp b/src/modules/custom.cpp
index 7f66213d..5e5d7019 100644
--- a/src/modules/custom.cpp
+++ b/src/modules/custom.cpp
@@ -170,6 +170,12 @@ auto waybar::modules::Custom::update() -> void {
           if (label_.get_tooltip_markup() != str) {
             label_.set_tooltip_markup(str);
           }
+        } else if (config_["tooltip-format"].isString()) {
+          auto tooltip = config_["tooltip-format"].asString();
+          tooltip = fmt::format(fmt::runtime(tooltip), text_, fmt::arg("alt", alt_),
+                                fmt::arg("icon", getIcon(percentage_, alt_)),
+                                fmt::arg("percentage", percentage_));
+          label_.set_tooltip_markup(tooltip);
         } else {
           if (label_.get_tooltip_markup() != tooltip_) {
             label_.set_tooltip_markup(tooltip_);