diff --git a/applets/systemtray/package/contents/applet/CompactApplet.qml b/applets/systemtray/package/contents/applet/CompactApplet.qml
index 16e2ed955..deb9358ec 100644
--- a/applets/systemtray/package/contents/applet/CompactApplet.qml
+++ b/applets/systemtray/package/contents/applet/CompactApplet.qml
@@ -1,77 +1,77 @@
 /*
  *   Copyright 2011 Marco Martin <mart@kde.org>
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
  *   published by the Free Software Foundation; either version 2, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *   GNU Library General Public License for more details
  *
  *   You should have received a copy of the GNU Library General Public
  *   License along with this program; if not, write to the
  *   Free Software Foundation, Inc.,
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 import QtQuick 2.1
 import QtQuick.Layouts 1.1
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.plasmoid 2.0
 
 
 PlasmaCore.ToolTipArea {
     id: appletRoot
     objectName: "org.kde.desktop-CompactApplet"
     anchors.fill: parent
 
     icon: plasmoid.icon
     mainText: plasmoid.toolTipMainText
     subText: plasmoid.toolTipSubText
-    location: if (plasmoid.parent && plasmoid.parent.parent.objectName == "hiddenTasksColumn") {
+    location: if (plasmoid.parent && plasmoid.parent.parent.objectName == "hiddenTasksColumn" && plasmoid.location != PlasmaCore.Types.LeftEdge) {
                 return PlasmaCore.Types.RightEdge;
               } else {
                 return plasmoid.location;
               }
     active: !plasmoid.expanded
     textFormat: plasmoid.toolTipTextFormat
     mainItem: plasmoid.toolTipItem ? plasmoid.toolTipItem : null
 
     property Item fullRepresentation
     property Item compactRepresentation
 
     Layout.minimumWidth: {
         switch (plasmoid.formFactor) {
         case PlasmaCore.Types.Vertical:
             return 0;
         case PlasmaCore.Types.Horizontal:
             return height;
         default:
             return units.gridUnit * 3;
         }
     }
 
     Layout.minimumHeight: {
         switch (plasmoid.formFactor) {
         case PlasmaCore.Types.Vertical:
             return width;
         case PlasmaCore.Types.Horizontal:
             return 0;
         default:
             return units.gridUnit * 3;
         }
     }
 
     onCompactRepresentationChanged: {
         if (compactRepresentation) {
             compactRepresentation.parent = appletRoot;
             compactRepresentation.anchors.fill = appletRoot;
             compactRepresentation.visible = true;
         }
         appletRoot.visible = true;
     }
 }
 
diff --git a/applets/systemtray/package/contents/ui/items/AbstractItem.qml b/applets/systemtray/package/contents/ui/items/AbstractItem.qml
index 7b84a04a5..7b0bbb5d4 100644
--- a/applets/systemtray/package/contents/ui/items/AbstractItem.qml
+++ b/applets/systemtray/package/contents/ui/items/AbstractItem.qml
@@ -1,115 +1,115 @@
 /*
  *   Copyright 2016 Marco Martin <mart@kde.org>
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
  *   published by the Free Software Foundation; either version 2, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *   GNU Library General Public License for more details
  *
  *   You should have received a copy of the GNU Library General Public
  *   License along with this program; if not, write to the
  *   Free Software Foundation, Inc.,
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 import QtQuick 2.1
 import QtQml.Models 2.2
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 
 PlasmaCore.ToolTipArea {
     id: abstractItem
 
     height: hidden ? root.hiddenItemSize + marginHints.top + marginHints.bottom : root.itemSize + marginHints.top + marginHints.bottom
     width: labelVisible ? parent.width : height + marginHints.left + marginHints.right
 
     property string itemId
     property string category
     property alias text: label.text
     property bool hidden: parent.objectName == "hiddenTasksColumn"
     property QtObject marginHints: parent.marginHints
     property bool labelVisible: abstractItem.hidden && !root.activeApplet
     property Item iconItem
     //PlasmaCore.Types.ItemStatus
     property int status
     property QtObject model
 
     signal clicked(var mouse)
     signal wheel(var wheel)
 
     property bool forcedHidden: plasmoid.configuration.hiddenItems.indexOf(itemId) !== -1
     property bool forcedShown: plasmoid.configuration.showAllItems || plasmoid.configuration.shownItems.indexOf(itemId) !== -1
     property bool categoryShown: shownCategories.indexOf(category) != -1;
 
 
     /* subclasses need to assign to this tiiltip properties
     mainText:
     subText:
     icon: 
     */
 
-    location: if (abstractItem.parent && abstractItem.parent.objectName == "hiddenTasksColumn") {
+    location: if (abstractItem.parent && abstractItem.parent.objectName == "hiddenTasksColumn" && plasmoid.location != PlasmaCore.Types.LeftEdge) {
                 return PlasmaCore.Types.RightEdge;
               } else {
-                return abstractItem.location;
+                return plasmoid.location;
               }
 
 //BEGIN CONNECTIONS
 
     onStatusChanged: updateItemVisibility(abstractItem);
 
     onContainsMouseChanged: {
         if (hidden && containsMouse) {
             root.hiddenLayout.hoveredItem = abstractItem
         }
     }
 
     Component.onCompleted: updateItemVisibility(abstractItem);
     onForcedHiddenChanged: updateItemVisibility(abstractItem);
     onForcedShownChanged: updateItemVisibility(abstractItem);
     onCategoryShownChanged: updateItemVisibility(abstractItem);
 
     //dangerous but needed due how repeater reparents
     onParentChanged: updateItemVisibility(abstractItem);
 
 //END CONNECTIONS
 
     PulseAnimation {
         targetItem: abstractItem
         running: (abstractItem.status === PlasmaCore.Types.NeedsAttentionStatus ||
             abstractItem.status === PlasmaCore.Types.RequiresAttentionStatus ) &&
             units.longDuration > 0
     }
 
     MouseArea {
         id: mouseArea
         anchors.fill: abstractItem
         hoverEnabled: true
         drag.filterChildren: true
         acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
         onClicked: abstractItem.clicked(mouse)
         onWheel: abstractItem.wheel(wheel)
     }
 
     PlasmaComponents.Label {
         id: label
         opacity: labelVisible ? 1 : 0
         x: iconItem ? iconItem.width + units.smallSpacing : 0
         visible: abstractItem.hidden
         Behavior on opacity {
             NumberAnimation {
                 duration: units.longDuration
                 easing.type: Easing.InOutQuad
             }
         }
         anchors {
             verticalCenter: parent.verticalCenter
         }
     }
 }