diff --git a/lib/redux/ui/pref_state.dart b/lib/redux/ui/pref_state.dart
index f3bd68abe..5103efd68 100644
--- a/lib/redux/ui/pref_state.dart
+++ b/lib/redux/ui/pref_state.dart
@@ -86,9 +86,15 @@ abstract class PrefState implements Built<PrefState, PrefStateBuilder> {
 
   bool get isNotMobile => !isMobile;
 
-  bool get isModuleList => moduleLayout == ModuleLayout.list;
+  bool get isModuleList {
+    if (isDesktop && !isPreviewEnabled) {
+      return false;
+    }
 
-  bool get isModuleTable => moduleLayout == ModuleLayout.table;
+    return moduleLayout == ModuleLayout.list;
+  }
+
+  bool get isModuleTable => !isModuleList;
 
   bool get isMenuFloated =>
       appLayout == AppLayout.mobile || menuSidebarMode == AppSidebarMode.float;
@@ -109,14 +115,6 @@ abstract class PrefState implements Built<PrefState, PrefStateBuilder> {
       menuSidebarMode == AppSidebarMode.collapse &&
       !isMenuVisible;
 
-  bool get isListLayout {
-    if (isDesktop && !isPreviewEnabled) {
-      return false;
-    }
-
-    return moduleLayout == ModuleLayout.list;
-  }
-
   // ignore: unused_element
   static void _initializeBuilder(PrefStateBuilder builder) => builder
     ..useSidebarEditor.replace(BuiltMap<EntityType, bool>())
diff --git a/lib/ui/app/app_bottom_bar.dart b/lib/ui/app/app_bottom_bar.dart
index 0824e8e4f..82aab5040 100644
--- a/lib/ui/app/app_bottom_bar.dart
+++ b/lib/ui/app/app_bottom_bar.dart
@@ -348,7 +348,7 @@ class _AppBottomBarState extends State<AppBottomBar> {
       final localization = AppLocalization.of(context);
       final prefState = store.state.prefState;
       final isList =
-          widget.entityType.isSetting || state.prefState.isListLayout;
+          widget.entityType.isSetting || state.prefState.isModuleList;
 
       void _onColumnsPressed() {
         multiselectDialog(
diff --git a/lib/ui/app/main_screen.dart b/lib/ui/app/main_screen.dart
index 9b52fb561..c363ad28f 100644
--- a/lib/ui/app/main_screen.dart
+++ b/lib/ui/app/main_screen.dart
@@ -322,7 +322,8 @@ class EntityScreens extends StatelessWidget {
     final isPdf = subRoute == 'pdf';
 
     final isFullScreen = state.isFullScreen;
-    final isPreviewVisible = prefState.isPreviewVisible;
+    final isPreviewVisible =
+        prefState.isPreviewVisible && prefState.isPreviewEnabled;
     bool isPreviewShown = isPreviewVisible;
 
     if (subRoute != 'view' && subRoute.isNotEmpty) {
diff --git a/lib/ui/app/tables/entity_list.dart b/lib/ui/app/tables/entity_list.dart
index 19681b756..7f5bc36e1 100644
--- a/lib/ui/app/tables/entity_list.dart
+++ b/lib/ui/app/tables/entity_list.dart
@@ -108,7 +108,7 @@ class _EntityListState extends State<EntityList> {
     final entityList = widget.entityList;
     final entityMap = state.getEntityMap(entityType);
     final countSelected = (listUIState.selectedIds ?? <String>[]).length;
-    final isList = entityType.isSetting || state.prefState.isListLayout;
+    final isList = entityType.isSetting || state.prefState.isModuleList;
 
     if (!state.isLoaded && entityList.isEmpty) {
       return LoadingIndicator();