diff --git a/CHANGES.md b/CHANGES.md
index 735f37304f..71cecacf3b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,7 @@
 ### :sparkles: New features
 ### :bug: Bugs fixed
 
+- Fix display code icon on preview hover [Taiga #2838](https://tree.taiga.io/project/penpot/us/2838)
 - Duplicate artboards create new flows if needed [Taiga #2221](https://tree.taiga.io/project/penpot/issue/2221)
 - Add new invitations section [Taiga #2797](https://tree.taiga.io/project/penpot/us/2797)
 - Ability to add multiple fills to a shape [Taiga #1394](https://tree.taiga.io/project/penpot/us/1394)
diff --git a/frontend/resources/styles/main/partials/handoff.scss b/frontend/resources/styles/main/partials/handoff.scss
index 3ebfd23741..6a2b949d1e 100644
--- a/frontend/resources/styles/main/partials/handoff.scss
+++ b/frontend/resources/styles/main/partials/handoff.scss
@@ -319,19 +319,21 @@
   margin-top: 0.5rem;
   border-top: 1px solid $color-gray-60;
 
-  .code-row-lang {
-    position: relative;
-    display: flex;
-    flex-direction: row;
-    margin: 0.5rem;
-
-    &:hover {
+  &:hover {
+    .code-row-lang {
       .expand-button,
       .copy-button {
         visibility: visible;
         opacity: 1;
       }
     }
+  }
+
+  .code-row-lang {
+    position: relative;
+    display: flex;
+    flex-direction: row;
+    margin: 0.5rem;
 
     .code-selection {
       height: 100%;