diff --git a/CHANGES.md b/CHANGES.md
index 36aa1557d..6bf446afc 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -26,6 +26,8 @@
 - Fix problem with masks interactions outside bounds [#718](https://github.com/penpot/penpot/issues/718)
 - Fix issues with Alt key in distance measurement [#672](https://github.com/penpot/penpot/issues/672)
 - Fix problem with rotation degree input [#741](https://github.com/penpot/penpot/issues/741)
+- Fix problem with resolved comments [Taiga #1406](https://tree.taiga.io/project/penpot/issue/1406)
+- Fix problem with comments styles on dashboard [Taiga #1405](https://tree.taiga.io/project/penpot/issue/1405)
 
 ### :heart: Community contributions by (Thank you!)
 
diff --git a/backend/src/app/rpc/mutations/comments.clj b/backend/src/app/rpc/mutations/comments.clj
index 6df145155..3008b8733 100644
--- a/backend/src/app/rpc/mutations/comments.clj
+++ b/backend/src/app/rpc/mutations/comments.clj
@@ -146,14 +146,14 @@
   (db/with-atomic [conn pool]
     (let [thread (db/get-by-id conn :comment-thread id {:for-update true})]
       (when-not thread
-        (ex/raise :type :not-found)
+        (ex/raise :type :not-found))
 
       (files/check-read-permissions! conn profile-id (:file-id thread))
 
       (db/update! conn :comment-thread
                   {:is-resolved is-resolved}
                   {:id id})
-      nil))))
+      nil)))
 
 
 ;; --- Mutation: Add Comment
diff --git a/frontend/resources/styles/main/partials/comments.scss b/frontend/resources/styles/main/partials/comments.scss
index bec73296e..05679f849 100644
--- a/frontend/resources/styles/main/partials/comments.scss
+++ b/frontend/resources/styles/main/partials/comments.scss
@@ -246,6 +246,7 @@
   pointer-events: auto;
 
   .thread-groups {
+
     hr {
       border: 0;
       height: 1px;
@@ -424,16 +425,18 @@
     }
   }
 
-  .thread-group {
-    .section-title {
-      color: $color-black;
-    }
+  .thread-groups {
+    max-height: calc(30rem - 40px);
+    overflow: auto;
 
-    .threads {
-      max-height: 25rem;
-      overflow: auto;
+    hr {
+      background-color: $color-gray-10;
     }
   }
+
+  .thread-group .section-title {
+    color: $color-black;
+  }
   
   .comment {
     .author .name .fullname {
diff --git a/frontend/src/app/main/data/comments.cljs b/frontend/src/app/main/data/comments.cljs
index dd8107898..a9136069c 100644
--- a/frontend/src/app/main/data/comments.cljs
+++ b/frontend/src/app/main/data/comments.cljs
@@ -327,9 +327,7 @@
   (let [{:keys [show mode open]} cstate]
     (cond->> threads
       (= :pending show)
-      (filter (fn [item]
-                (or (not (:is-resolved item))
-                    (= (:id item) open))))
+      (filter (comp not :is-resolved))
 
       (= :yours mode)
       (filter #(contains? (:participants %) (:id profile))))))