diff --git a/lib/redux/app/app_reducer.dart b/lib/redux/app/app_reducer.dart
index d8e7f28e5..3dca77a46 100644
--- a/lib/redux/app/app_reducer.dart
+++ b/lib/redux/app/app_reducer.dart
@@ -13,8 +13,7 @@ AppState appReducer(AppState state, dynamic action) {
   if (action is UserLogout) {
     return AppState().rebuild((b) => b
       ..authState.replace(state.authState)
-      ..uiState.enableDarkMode =
-          state.uiState.enableDarkMode || state.uiState.isTesting
+      ..uiState.enableDarkMode = state.uiState.enableDarkMode
       ..uiState.isTesting = state.uiState.isTesting);
   } else if (action is LoadStateSuccess) {
     return action.state.rebuild((b) => b
diff --git a/test_driver/products_it_test.dart b/test_driver/products_it_test.dart
index 883051b67..a183fbd00 100644
--- a/test_driver/products_it_test.dart
+++ b/test_driver/products_it_test.dart
@@ -89,11 +89,13 @@ void main() {
 
     // Edit the newly created product
     test('Edit an existing product', () async {
-      print('Select product: $productKey');
-      await driver.scrollUntilVisible(
-          find.byType('ListView'), find.text(productKey),
-          dyScroll: -300);
-      await driver.tap(find.text(productKey));
+      if (await isMobile(driver)) {
+        print('Select product: $productKey');
+        await driver.scrollUntilVisible(
+            find.byType('ListView'), find.text(productKey),
+            dyScroll: -300);
+        await driver.tap(find.text(productKey));
+      }
 
       print('Tap edit');
       await driver.tap(find.text(localization.edit));