diff --git a/discover/qml/DiscoverPage.qml b/discover/qml/DiscoverPage.qml
index 011a8bc0..cb628c54 100644
--- a/discover/qml/DiscoverPage.qml
+++ b/discover/qml/DiscoverPage.qml
@@ -1,64 +1,51 @@
 /*
  *   Copyright (C) 2015 Aleix Pol Gonzalez <aleixpol@blue-systems.com>
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library/Lesser General Public License
  *   version 2, or (at your option) any later version, as published by the
  *   Free Software Foundation
  *
  *   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 General Public License for more details
  *
  *   You should have received a copy of the GNU Library/Lesser 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 org.kde.kirigami 2.0 as Kirigami
 
 Kirigami.ScrollablePage
 {
     id: root
 
     readonly property var s1: Shortcut {
         sequence: StandardKey.MoveToNextPage
         enabled: root.isCurrentPage
         onActivated: {
-            if (root.flickable.atYEnd)
-                return;
-
-            if (root.flickable.contentY + root.flickable.height > root.flickable.contentHeight) {
-                root.flickable.contentY += root.flickable.height
-            } else {
-                root.flickable.contentY = root.flickable.contentHeight - root.flickable.height
-            }
+            root.flickable.contentY = Math.min(root.flickable.contentHeight - root.flickable.height,
+                                               root.flickable.contentY + root.flickable.height);
         }
     }
 
     readonly property var s2: Shortcut {
         sequence: StandardKey.MoveToPreviousPage
         enabled: root.isCurrentPage
         onActivated: {
-            if (root.flickable.atYBeginning)
-                return;
-
-            if (root.flickable.contentY > root.flickable.height) {
-                root.flickable.contentY -= root.flickable.height
-            } else {
-                root.flickable.contentY = 0
-            }
+            root.flickable.contentY = Math.max(0, root.flickable.contentY - root.flickable.height);
         }
     }
 
     readonly property var sClose: Shortcut {
         sequence: StandardKey.Cancel
         enabled: root.isCurrentPage && applicationWindow().pageStack.depth>1
         onActivated: {
             applicationWindow().pageStack.pop()
         }
     }
 }