diff --git a/core/src/main/java/com/github/weisj/darklaf/ui/button/DarkButtonUI.java b/core/src/main/java/com/github/weisj/darklaf/ui/button/DarkButtonUI.java
index d8a43223..f9f5f398 100644
--- a/core/src/main/java/com/github/weisj/darklaf/ui/button/DarkButtonUI.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/button/DarkButtonUI.java
@@ -44,6 +44,7 @@ import com.github.weisj.darklaf.graphics.GraphicsUtil;
 import com.github.weisj.darklaf.graphics.PaintUtil;
 import com.github.weisj.darklaf.ui.togglebutton.DarkToggleButtonKeyHandler;
 import com.github.weisj.darklaf.ui.togglebutton.ToggleButtonFocusNavigationActions;
+import com.github.weisj.darklaf.ui.tooltip.ToolTipConstants;
 import com.github.weisj.darklaf.util.AlignmentExt;
 import com.github.weisj.darklaf.util.DarkUIUtil;
 import com.github.weisj.darklaf.util.PropertyKey;
@@ -104,6 +105,7 @@ public class DarkButtonUI extends BasicButtonUI implements ButtonConstants {
     @Override
     protected void installDefaults(final AbstractButton b) {
         super.installDefaults(b);
+        PropertyUtil.installProperty(b, ToolTipConstants.KEY_STYLE, ToolTipConstants.VARIANT_BALLOON);
         LookAndFeel.installProperty(b, PropertyKey.OPAQUE, false);
         borderSize = UIManager.getInt("Button.borderThickness");
         shadowHeight = UIManager.getInt("Button.shadowHeight");
diff --git a/core/src/test/java/ui/button/ButtonDemo.java b/core/src/test/java/ui/button/ButtonDemo.java
index c5bf4f21..9d97cb93 100644
--- a/core/src/test/java/ui/button/ButtonDemo.java
+++ b/core/src/test/java/ui/button/ButtonDemo.java
@@ -46,6 +46,7 @@ public class ButtonDemo implements ComponentDemo {
     public JComponent createComponent() {
         Icon icon = DemoResources.FOLDER_ICON;
         JButton button = new JButton("Test Button", icon);
+        button.setToolTipText("TipText");
         DemoPanel panel = new DemoPanel(button);
         JPanel controlPanel = panel.addControls();
         controlPanel.add(new JCheckBox("enabled") {