diff --git a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/components/CollapsedCommentCard.kt b/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/components/CollapsedCommentCard.kt
index a32856a94..f1843ad7a 100644
--- a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/components/CollapsedCommentCard.kt
+++ b/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/components/CollapsedCommentCard.kt
@@ -21,6 +21,7 @@ import com.github.diegoberaldin.raccoonforlemmy.core.appearance.data.VoteFormat
 import com.github.diegoberaldin.raccoonforlemmy.core.appearance.di.getThemeRepository
 import com.github.diegoberaldin.raccoonforlemmy.core.appearance.theme.IconSize
 import com.github.diegoberaldin.raccoonforlemmy.core.appearance.theme.Spacing
+import com.github.diegoberaldin.raccoonforlemmy.core.utils.compose.onClick
 import com.github.diegoberaldin.raccoonforlemmy.core.utils.toLocalDp
 import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.CommentModel
 import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.UserModel
@@ -34,6 +35,7 @@ fun CollapsedCommentCard(
     autoLoadImages: Boolean = true,
     actionButtonsActive: Boolean = true,
     options: List<Option> = emptyList(),
+    onClick: (() -> Unit)? = null,
     onOpenCreator: ((UserModel) -> Unit)? = null,
     onUpVote: (() -> Unit)? = null,
     onDownVote: (() -> Unit)? = null,
@@ -52,7 +54,9 @@ fun CollapsedCommentCard(
         endColor = MaterialTheme.colorScheme.background,
     )
     Column(
-        modifier = modifier
+        modifier = modifier.onClick(
+            onClick = onClick ?: {},
+        )
     ) {
         Box(
             modifier = Modifier.padding(
diff --git a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/postdetail/PostDetailScreen.kt b/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/postdetail/PostDetailScreen.kt
index 924af48e7..cba076cf3 100644
--- a/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/postdetail/PostDetailScreen.kt
+++ b/core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/postdetail/PostDetailScreen.kt
@@ -666,6 +666,13 @@ class PostDetailScreen(
                                                             )
                                                         )
                                                     },
+                                                    onClick = rememberCallback(model) {
+                                                        model.reduce(
+                                                            PostDetailMviModel.Intent.ToggleExpandComment(
+                                                                comment.id
+                                                            )
+                                                        )
+                                                    },
                                                     onDoubleClick = if (!uiState.doubleTapActionEnabled) {
                                                         null
                                                     } else {
@@ -878,6 +885,14 @@ class PostDetailScreen(
                                             comment = comment,
                                             actionButtonsActive = uiState.isLogged,
                                             onToggleExpanded = rememberCallback(model) {
+                                                model.reduce(
+                                                    PostDetailMviModel.Intent.ToggleExpandComment(
+                                                        comment.id
+                                                    )
+
+                                                )
+                                            },
+                                            onClick = rememberCallback(model) {
                                                 model.reduce(
                                                     PostDetailMviModel.Intent.ToggleExpandComment(
                                                         comment.id