diff --git a/BREAKING-CHANGES.txt b/BREAKING-CHANGES.txt
index 3b89431975..87f6a4e652 100644
--- a/BREAKING-CHANGES.txt
+++ b/BREAKING-CHANGES.txt
@@ -1,5 +1,28 @@
 JUCE breaking changes
 =====================
+
+develop
+=============
+
+Change
+------
+Viewport now enables "scroll on drag" mode by default on Android and iOS.
+
+Possible Issues
+---------------
+Any code relying on "scroll on drag" mode being turned off by default, should disable
+it manually.
+
+Workaround
+----------
+None.
+
+Rationale
+---------
+It is expected on mobile devices to be able to scroll a list by just a drag,
+rather than using a dedicated scrollbar. The scrollbar is still available though if
+needed.
+
 
 Version 5.1.2
 =============
diff --git a/modules/juce_gui_basics/layout/juce_Viewport.cpp b/modules/juce_gui_basics/layout/juce_Viewport.cpp
index e1b940a49a..632fb11605 100644
--- a/modules/juce_gui_basics/layout/juce_Viewport.cpp
+++ b/modules/juce_gui_basics/layout/juce_Viewport.cpp
@@ -38,6 +38,10 @@ Viewport::Viewport (const String& name)  : Component (name)
     setInterceptsMouseClicks (false, true);
     setWantsKeyboardFocus (true);
 
+  #if JUCE_ANDROID || JUCE_IOS
+    setScrollOnDragEnabled (true);
+  #endif
+
     recreateScrollbars();
 }