diff --git a/src/GUI/qml/FirstRun.qml b/src/GUI/qml/FirstRun.qml
index 3697faa34..48d59c679 100644
--- a/src/GUI/qml/FirstRun.qml
+++ b/src/GUI/qml/FirstRun.qml
@@ -1,4 +1,6 @@
 import QtQuick 2.4
+import QtQuick.Controls 2.2
+
 import FlightGear 1.0
 import FlightGear.Launcher 1.0
 import "."
@@ -19,6 +21,8 @@ Item {
         contentHeight: textColumn.childrenRect.height + imageClipFrame.height + (Style.strutSize * 2)
         flickableDirection: Flickable.VerticalFlick
 
+        ScrollBar.vertical: ScrollBar {}
+
         anchors.fill: parent
 
 
@@ -151,13 +155,4 @@ Item {
 
     } // of Flickable
 
-
-    Scrollbar {
-        id: scrollbar
-        anchors.right: parent.right
-        height: flick.height
-        flickable: flick
-        visible: flick.contentHeight > flick.height
-    }
-
 } // of Item
diff --git a/src/GUI/qml/HelpSupport.qml b/src/GUI/qml/HelpSupport.qml
index f73276db6..c37f1db94 100644
--- a/src/GUI/qml/HelpSupport.qml
+++ b/src/GUI/qml/HelpSupport.qml
@@ -1,4 +1,6 @@
 import QtQuick 2.4
+import QtQuick.Controls 2.2
+
 import FlightGear.Launcher 1.0
 import "."
 
@@ -17,9 +19,10 @@ Item {
         contentHeight: contentColumn.childrenRect.height
         flickableDirection: Flickable.VerticalFlick
         height: parent.height
-        width: parent.width - (Style.strutSize * 4 + scrollbar.width)
+        width: parent.width - (Style.strutSize * 4)
         x: Style.strutSize * 2
         y: Style.strutSize
+        ScrollBar.vertical: ScrollBar {}
 
         Column {
             id: contentColumn
@@ -83,12 +86,4 @@ Item {
         }
 
     } // of flickable
-
-    Scrollbar {
-        id: scrollbar
-        anchors.right: parent.right
-        height: flick.height
-        flickable: flick
-        visible: flick.contentHeight > flick.height
-    }
 }
diff --git a/src/GUI/qml/Location.qml b/src/GUI/qml/Location.qml
index ba78316f8..439a6a094 100644
--- a/src/GUI/qml/Location.qml
+++ b/src/GUI/qml/Location.qml
@@ -1,4 +1,6 @@
 import QtQuick 2.4
+import QtQuick.Controls 2.2
+
 import FlightGear 1.0
 import FlightGear.Launcher 1.0
 import "."
@@ -271,6 +273,7 @@ Item {
         model: root.locationModel
         delegate: locationSearchDelegate
         clip: true
+        ScrollBar.vertical: ScrollBar {}
 
         header: Item {
             visible: !root.showCarriers && _location.searchModel.isSearchActive