diff --git a/lib/main.dart b/lib/main.dart
index ecab8bc65..e0a0117f2 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -97,7 +97,7 @@ void main({bool isTesting = false}) async {
   final prefs = await SharedPreferences.getInstance();
   final enableDarkMode = prefs.getBool(kSharedPrefEnableDarkMode) ?? true;
   final longPressSelectionIsDefault =
-      prefs.getBool(kSharedPrefLongPressSelectionIsDefault) ?? true;
+      prefs.getBool(kSharedPrefLongPressSelectionIsDefault) ?? false;
   final requireAuthentication =
       prefs.getBool(kSharedPrefRequireAuthentication) ?? false;
 
diff --git a/lib/ui/settings/invoice_design.dart b/lib/ui/settings/invoice_design.dart
index acf232466..297c62a38 100644
--- a/lib/ui/settings/invoice_design.dart
+++ b/lib/ui/settings/invoice_design.dart
@@ -42,7 +42,7 @@ class _InvoiceDesignState extends State<InvoiceDesign>
   void initState() {
     super.initState();
     _focusNode = FocusScopeNode();
-    _controller = TabController(vsync: this, length: 4);
+    _controller = TabController(vsync: this, length: 2);
   }
 
   @override
@@ -105,12 +105,6 @@ class _InvoiceDesignState extends State<InvoiceDesign>
           Tab(
             text: localization.invoiceOptions,
           ),
-          Tab(
-            text: localization.invoiceFields,
-          ),
-          Tab(
-            text: localization.productFields,
-          ),
         ],
       ),
       body: AppTabForm(
@@ -258,8 +252,6 @@ class _InvoiceDesignState extends State<InvoiceDesign>
               ),
             ],
           ),
-          ListView(),
-          ListView(),
         ],
       ),
     );