diff --git a/extenderitem.cpp b/extenderitem.cpp
index 13a930c40..308c8325b 100644
--- a/extenderitem.cpp
+++ b/extenderitem.cpp
@@ -399,7 +399,8 @@ void ExtenderItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
     painter->setRenderHint(QPainter::TextAntialiasing, true);
     painter->setRenderHint(QPainter::Antialiasing, true);
 
-    if (d->background->enabledBorders() != (PanelSvg::LeftBorder | PanelSvg::RightBorder)) {
+    if (d->background->enabledBorders() != (PanelSvg::LeftBorder | PanelSvg::RightBorder) &&
+        d->background->enabledBorders()) {
         //Don't paint if only the left and right borders are enabled, we only use the left and right
         //border in this situation to set the correct margins on this item.
         d->background->paintPanel(painter, QPointF(0, 0));
diff --git a/popupapplet.cpp b/popupapplet.cpp
index 0de3469c0..20965847b 100644
--- a/popupapplet.cpp
+++ b/popupapplet.cpp
@@ -242,7 +242,9 @@ void PopupAppletPrivate::popupConstraintsEvent(Plasma::Constraints constraints)
 
                     Extender *extender = qobject_cast<Extender*>(gWidget);
                     if (extender) {
-                        if (q->location() == TopEdge) {
+                        if (q->formFactor() == MediaCenter || q->formFactor() == Planar) {
+                            extender->setExtenderAppearance(Extender::NoBorders);
+                        } else if (q->location() == TopEdge) {
                             extender->setExtenderAppearance(Extender::TopDownStacked);
                         } else {
                             extender->setExtenderAppearance(Extender::BottomUpStacked);