diff --git a/lib/redux/app/app_actions.dart b/lib/redux/app/app_actions.dart
index 09cc0dbb7..e9853b6ee 100644
--- a/lib/redux/app/app_actions.dart
+++ b/lib/redux/app/app_actions.dart
@@ -1406,7 +1406,7 @@ void selectEntity({
       uiState.isViewing &&
       !entity.entityType.isSetting &&
       entityUIState.selectedId == entity.id &&
-      state.prefState.isPreviewVisible) {
+      (state.prefState.isPreviewVisible || state.prefState.isModuleList)) {
     if (entityUIState.tabIndex > 0) {
       store.dispatch(PreviewEntity());
     } else {