diff --git a/config/waybar/modules.json b/config/waybar/modules.json
index 2361fb0..b707f07 100644
--- a/config/waybar/modules.json
+++ b/config/waybar/modules.json
@@ -29,7 +29,9 @@
         "format-connected": "<big>\uf294</big>c",
         "max-length": 10.3,
         "on-click": "alacritty --title 'FZF-Jump' -e ~/.scripts/fzf-jump/standalone.sh ~/.scripts/fzf-jump/modules/bluetooth.sh",
-        "tooltip-format": "{status} ({num_connections}):\n{device_enumerate}", 
+        "tooltip-format": "{status}",
+        "tooltip-format-on": "{status}, no devices connected",
+        "tooltip-format-connected": "{status} ({num_connections}):\n{device_enumerate}", 
         "tooltip-format-enumerate-connected": "{device_alias} ({device_address})",
         "tooltip-format-enumerate-connected-battery": "{device_alias}\t{device_address}\t{device_battery_percentage}"
     },
@@ -94,7 +96,8 @@
         "interval": 5,
         "on-click-right": "alacritty -e nmtui",
         "tooltip-format": "{ifname}: {ipaddr}",
-        "tooltip-format-wifi": "{essid} ({signalStrength}%) - {ifname}: {ipaddr}"
+        "tooltip-format-disconnected": "Disconnected",
+        "tooltip-format-wifi": "{essid} ({signalStrength}%)\n{ifname}: {ipaddr}"
     },