diff --git a/src/controls/templates/AbstractApplicationHeader.qml b/src/controls/templates/AbstractApplicationHeader.qml
index 6b8d08c8..dfdf86f8 100644
--- a/src/controls/templates/AbstractApplicationHeader.qml
+++ b/src/controls/templates/AbstractApplicationHeader.qml
@@ -1,189 +1,190 @@
 /*
  *   Copyright 2015 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.5
 import QtQuick.Layouts 1.2
 import "private"
 import org.kde.kirigami 2.4
 
 
 /**
  * An item that can be used as a title for the application.
  * Scrolling the main page will make it taller or shorter (trough the point of going away)
  * It's a behavior similar to the typical mobile web browser addressbar
  * the minimum, preferred and maximum heights of the item can be controlled with
  * * minimumHeight: default is 0, i.e. hidden
  * * preferredHeight: default is Units.gridUnit * 1.6
  * * preferredHeight: default is Units.gridUnit * 3
  *
  * To achieve a titlebar that stays completely fixed just set the 3 sizes as the same
  * @inherit QtQuick.Item
  */
 Item {
     id: root
     z: 90
     property int minimumHeight: 0
     property int preferredHeight: Units.gridUnit * 2
     property int maximumHeight: Units.gridUnit * 3
     property PageRow pageRow: __appWindow.pageStack
     property Page page: pageRow.currentItem
     default property alias contentItem: mainItem.data
     readonly property int paintedHeight: headerItem.y + headerItem.height - 1
     LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft 
     LayoutMirroring.childrenInherit: true
     property int leftPadding: 0
     property int topPadding: 0
     property int rightPadding: 0
     property int bottomPadding: 0
     property bool separatorVisible: true
 
     //FIXME: remove
     property QtObject __appWindow: applicationWindow();
 
     anchors {
         left: parent.left
         right: parent.right
     }
     implicitHeight: preferredHeight
 
     /**
      * background: Item
      * This property holds the background item.
      * Note: the background will be automatically sized as the whole control
      */
     property Item background
 
     onBackgroundChanged: {
         background.z = -1;
         background.parent = headerItem;
         background.anchors.fill = headerItem;
     }
 
     onMinimumHeightChanged: implicitHeight = preferredHeight;
     onPreferredHeightChanged: implicitHeight = preferredHeight;
 
     opacity: height > 0 ? 1 : 0
 
     Behavior on implicitHeight {
         enabled: root.page && root.page.flickable && !root.page.flickable.moving
         NumberAnimation {
             duration: Units.longDuration
             easing.type: Easing.InOutQuad
         }
     }
 
     Connections {
         target: __appWindow
         onControlsVisibleChanged: root.implicitHeight = __appWindow.controlsVisible ? root.preferredHeight : 0;
     }
 
     Item {
         id: headerItem
         property real computedRootHeight: root.preferredHeight
         anchors {
             left: parent.left
             right: parent.right
             bottom: parent.bottom
         }
 
         height: __appWindow.reachableMode && __appWindow.reachableModeEnabled ? root.maximumHeight : (root.minimumHeight > 0 ? Math.max(root.height, root.minimumHeight) : root.preferredHeight)
 
         Connections {
             id: headerSlideConnection
+            enabled: root.followsFlickable
             target: root.page ? root.page.flickable : null
             property int oldContentY
             property bool updatingContentY: false
             onContentYChanged: {
                 if (updatingContentY || !Settings.isMobile ||
                     !__appWindow.controlsVisible ||
                     !root.page ||
                     root.page.flickable.atYBeginning ||
                     root.page.flickable.atYEnd) {
                     oldContentY = root.page.flickable.contentY;
                     return;
                 //TODO: merge
                 //if moves but not dragging, just update oldContentY
                 } else if (!root.page.flickable.dragging) {
                     oldContentY = root.page.flickable.contentY;
                     return;
                 }
 
                 if (__appWindow.wideScreen || !Settings.isMobile) {
                     root.implicitHeight = root.preferredHeight;
                 } else {
                     var oldHeight = root.implicitHeight;
                     var oldContentItemY = root.page.contentItem.y;
 
                     root.implicitHeight = Math.max(root.minimumHeight,
                                             Math.min(root.preferredHeight,
                                                  root.implicitHeight + Math.floor(oldContentY - root.page.flickable.contentY)));
-
+print("AAAA "+oldHeight+" "+root.implicitHeight)
                     //if the implicitHeight is changed, use that to simulate scroll
-                    if (oldHeight != implicitHeight) {
+                    if (oldHeight != implicitHeight && root.toString().indexOf("PageRowGlobal") ==-1) {//FIXME
                         updatingContentY = true;
-                       // root.page.flickable.contentY -= (oldHeight - root.implicitHeight);
-                        root.page.flickable.contentY -= (oldContentItemY - root.page.contentItem.y)
+                        root.page.flickable.contentY -= (oldHeight - root.implicitHeight);
+                        //root.page.flickable.contentY -= (oldContentItemY - root.page.contentItem.y)
                         updatingContentY = false;
                     } //else {
                         oldContentY = root.page.flickable.contentY;
                     //}
 
                 }
             }
             onMovementEnded: {
                 if (__appWindow.wideScreen || !Settings.isMobile) {
                     return;
                 }
                 if (root.height > root.minimumHeight + (root.preferredHeight - root.minimumHeight)/2 ) {
                     root.implicitHeight = root.preferredHeight;
                 } else {
                     root.implicitHeight = root.minimumHeight;
                 }
             }
         }
         Connections {
             target: pageRow
             onCurrentItemChanged: {
                 if (!root.page) {
                     return;
                 }
                 if (root.page.flickable) {
                     headerSlideConnection.oldContentY = root.page.flickable.contentY;
                 } else {
                     headerSlideConnection.oldContentY = 0;
                 }
 
                 root.implicitHeight = root.preferredHeight;
             }
         }
 
         Item {
             id: mainItem
             clip: childrenRect.width > width
             anchors {
                 fill: parent
                 leftMargin: root.leftPadding
                 topMargin: root.topPadding
                 rightMargin: root.rightPadding
                 bottomMargin: root.bottomPadding
             }
         }
     }
 }