diff --git a/default/themed/shell.toml.tpl b/default/themed/shell.toml.tpl
index 42a202a7..9045f7d0 100644
--- a/default/themed/shell.toml.tpl
+++ b/default/themed/shell.toml.tpl
@@ -73,7 +73,7 @@ base-size = 12
 # Shared by every bar flyout. Body text inside flyouts is not separately
 # themable — it follows [bar].text.
 background = "{{ background }}"
-border     = "{{ foreground }}"
+border     = "{{ accent }}"
 
 [notifications]
 background = "{{ background }}"
diff --git a/shell/Commons/Color.qml b/shell/Commons/Color.qml
index 56f0949b..064abab7 100644
--- a/shell/Commons/Color.qml
+++ b/shell/Commons/Color.qml
@@ -38,7 +38,7 @@ QtObject {
   }
   readonly property QtObject popups: QtObject {
     property color background: root.pick("popups.background", root.background)
-    property color border: root.pick("popups.border", root.foreground)
+    property color border: root.pick("popups.border", root.pick("notifications.border", root.accent))
   }
   readonly property QtObject notifications: QtObject {
     property color background: root.pick("notifications.background", root.background)
diff --git a/shell/plugins/bar/widgets/weather.qml b/shell/plugins/bar/widgets/weather.qml
index 17d86e47..7f35f5fd 100644
--- a/shell/plugins/bar/widgets/weather.qml
+++ b/shell/plugins/bar/widgets/weather.qml
@@ -324,7 +324,6 @@ Item {
     triggerMode: "click"
     contentWidth: popup.fittedContentWidth(Style.space(480))
     contentHeight: popup.fittedContentHeight(weatherColumn.implicitHeight)
-    borderColor: Color.notifications.border
 
     Flickable {
       id: weatherScroll
diff --git a/shell/plugins/osd/Osd.qml b/shell/plugins/osd/Osd.qml
index 152798f6..f6ab65ff 100644
--- a/shell/plugins/osd/Osd.qml
+++ b/shell/plugins/osd/Osd.qml
@@ -94,7 +94,7 @@ Item {
       anchors.bottom: parent.bottom
       anchors.bottomMargin: Style.space(67)
       color: Color.alpha(Color.background, 0.97)
-      border.color: Color.foreground
+      border.color: Color.popups.border
       border.width: Math.max(1, Style.space(2))
       radius: Style.cornerRadius
       opacity: root.opened ? 1 : 0