diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/widgets/DataViewListWidgetContainer.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/widgets/DataViewListWidgetContainer.kt
index 38ae78582c..32f30fdcd0 100644
--- a/presentation/src/main/java/com/anytypeio/anytype/presentation/widgets/DataViewListWidgetContainer.kt
+++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/widgets/DataViewListWidgetContainer.kt
@@ -188,7 +188,7 @@ class DataViewListWidgetContainer(
                             )
                         )
                         if (params != null) {
-                            if (target?.type == DVViewerType.GALLERY) {
+                            if (widget is Widget.View && target?.type == DVViewerType.GALLERY) {
                                 galleryWidgetSubscribe(
                                     obj = obj,
                                     activeView = view,
@@ -336,7 +336,7 @@ class DataViewListWidgetContainer(
                 tabs = emptyList(),
                 elements = emptyList(),
                 isExpanded = true,
-                isCompact = (widget as? Widget.List)?.isCompact ?: false,
+                isCompact = widget.isCompact,
                 name = when(val source = widget.source) {
                     is Widget.Source.Bundled -> WidgetView.Name.Bundled(source = source)
                     is Widget.Source.Default ->  WidgetView.Name.Default(
diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/widgets/SelectWidgetTypeViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/widgets/SelectWidgetTypeViewModel.kt
index 7c1f03dd36..d9ea58aed4 100644
--- a/presentation/src/main/java/com/anytypeio/anytype/presentation/widgets/SelectWidgetTypeViewModel.kt
+++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/widgets/SelectWidgetTypeViewModel.kt
@@ -79,6 +79,8 @@ class SelectWidgetTypeViewModel(
                     // If the layout is a data view, provide View and Link widgets
                     objectLayout?.isDataView() == true -> listOf(
                         WidgetTypeView.View(),
+                        WidgetTypeView.CompactList(),
+                        WidgetTypeView.List(),
                         WidgetTypeView.Link()
                     )
 
@@ -145,6 +147,8 @@ class SelectWidgetTypeViewModel(
                     // If the layout is a data view, provide View and Link widgets
                     objectLayout?.isDataView() == true -> listOf(
                         WidgetTypeView.View(isSelected = false),
+                        WidgetTypeView.CompactList(),
+                        WidgetTypeView.List(),
                         WidgetTypeView.Link(isSelected = false)
                     )