diff --git a/CHANGELOG.md b/CHANGELOG.md
index c32426f1..6d8336e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -95,6 +95,11 @@ and this project adheres to
 
 - Fix `KeyError` when forgetting a room
 
+- Fix cursor shape not changing to carret when hovering text fields and areas.
+  This fix can only apply when the `enableKineticScrolling` setting is `true`,
+  until the project switches to Qt 5.15.
+
+
 ## 0.5.0
 
 ### Added
diff --git a/TODO.md b/TODO.md
index d19109a8..872e9c77 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,8 +1,5 @@
 # TODO
 
-- fix cursor over field
-- keyerror when forgetting room while loading members
-
 ## Refactoring
 
 - Rewrite account settings using `HTabbedContainer`
@@ -255,6 +252,7 @@
 
 - Added `WheelHandler`, an Event Handler for the mouse wheel, and optionally
   for emulated mouse wheel events coming from a trackpad.
+  - Rewrite `HKineticScrollingDisabler` with it 
 
 - Added `BoundaryRule` in Qt.labs.animation: a `PropertyValueInterceptor` that
   restricts the range of values a numeric property can have, applies
diff --git a/src/gui/Base/HFlickableColumnPage.qml b/src/gui/Base/HFlickableColumnPage.qml
index 027281d7..28f51d6e 100644
--- a/src/gui/Base/HFlickableColumnPage.qml
+++ b/src/gui/Base/HFlickableColumnPage.qml
@@ -29,6 +29,7 @@ HPage {
 
     HKineticScrollingDisabler {
         flickable: flickable
-        anchors.fill: flickable
+        width: enabled ? flickable.width : 0
+        height: enabled ? flickable.height : 0
     }
 }
diff --git a/src/gui/Base/HGridView.qml b/src/gui/Base/HGridView.qml
index 79bdc3d0..207f943d 100644
--- a/src/gui/Base/HGridView.qml
+++ b/src/gui/Base/HGridView.qml
@@ -119,6 +119,7 @@ GridView {
 
     HKineticScrollingDisabler {
         id: mouseArea
-        anchors.fill: parent
+        width: enabled ? parent.width : 0
+        height: enabled ? parent.height : 0
     }
 }
diff --git a/src/gui/Base/HKineticScrollingDisabler.qml b/src/gui/Base/HKineticScrollingDisabler.qml
index b0a49ea0..eeecc9e5 100644
--- a/src/gui/Base/HKineticScrollingDisabler.qml
+++ b/src/gui/Base/HKineticScrollingDisabler.qml
@@ -2,7 +2,6 @@
 
 import QtQuick 2.12
 
-// MouseArea component to disable kinetic scrolling
 MouseArea {
     id: mouseArea
     enabled: ! window.settings.enableKineticScrolling
diff --git a/src/gui/Base/HListView.qml b/src/gui/Base/HListView.qml
index 82391d64..413ec30e 100644
--- a/src/gui/Base/HListView.qml
+++ b/src/gui/Base/HListView.qml
@@ -120,6 +120,7 @@ ListView {
 
     HKineticScrollingDisabler {
         id: mouseArea
-        anchors.fill: parent
+        width: enabled ? parent.width : 0
+        height: enabled ? parent.height : 0
     }
 }