diff --git a/lib/main_app.dart b/lib/main_app.dart
index 6fac93987..a46be6b68 100644
--- a/lib/main_app.dart
+++ b/lib/main_app.dart
@@ -3,6 +3,7 @@ import 'dart:async';
 
 // Flutter imports:
 import 'package:flutter/foundation.dart';
+import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 
 // Package imports:
@@ -262,6 +263,7 @@ class InvoiceNinjaAppState extends State<InvoiceNinjaApp> {
             child: WebSocketRefresh(
               companyId: state.company?.id,
               child: MaterialApp(
+                scrollBehavior: MyCustomScrollBehavior(),
                 navigatorKey: navigatorKey,
                 supportedLocales: kLanguages
                     .map(
@@ -552,3 +554,11 @@ class InvoiceNinjaAppState extends State<InvoiceNinjaApp> {
     );
   }
 }
+
+class MyCustomScrollBehavior extends MaterialScrollBehavior {
+  @override
+  Set<PointerDeviceKind> get dragDevices => {
+        PointerDeviceKind.touch,
+        PointerDeviceKind.mouse,
+      };
+}
diff --git a/lib/ui/app/entity_dropdown.dart b/lib/ui/app/entity_dropdown.dart
index 78551bb31..10b89fe2f 100644
--- a/lib/ui/app/entity_dropdown.dart
+++ b/lib/ui/app/entity_dropdown.dart
@@ -327,7 +327,6 @@ class _EntityDropdownState extends State<EntityDropdown> {
       alignment: Alignment.centerRight,
       children: <Widget>[
         InkWell(
-          //key: ValueKey('__stack_${widget.labelText}__'),
           onTap: () => _showOptions(),
           child: IgnorePointer(
             child: TextFormField(