diff --git a/src/Juvix/Data/Comment.hs b/src/Juvix/Data/Comment.hs
index aee583fc52..061b0673ae 100644
--- a/src/Juvix/Data/Comment.hs
+++ b/src/Juvix/Data/Comment.hs
@@ -6,7 +6,7 @@ import Juvix.Data.CodeAnn (CodeAnn (..), PrettyCodeAnn, ppCodeAnn)
 import Juvix.Data.Loc
 import Juvix.Extra.Strings qualified as Str
 import Juvix.Prelude.Base
-import Prettyprinter
+import Prettyprinter hiding (concatWith)
 
 newtype Comments = Comments
   { _commentsByFile :: HashMap (Path Abs File) FileComments
@@ -117,12 +117,32 @@ instance Pretty Comment where
             . trimPrefixSpace
 
       trimPrefixSpace :: Text -> Text
-      trimPrefixSpace =
-        fromJust
-          . Text.stripSuffix "\n"
-          . Text.unlines
-          . map Text.strip
-          . Text.lines
+      trimPrefixSpace txt = case Text.unsnoc txt of
+        Nothing -> ""
+        Just (_, l) ->
+          appendNl
+            . striplines
+            $ txt
+          where
+            striplines :: Text -> Text
+            striplines =
+              concatWith (\a b -> a <> "\n" <> b)
+                . run
+                . execOutputList
+                . go True
+                . Text.lines
+            go :: (Members '[Output Text] r) => Bool -> [Text] -> Sem r ()
+            go isFirst = \case
+              [] -> return ()
+              a : as
+                | isFirst && isLast -> output a
+                | isFirst -> output (Text.stripEnd a) >> go False as
+                | isLast -> output (Text.stripStart a)
+                | otherwise -> output (Text.strip a) >> go False as
+                where
+                  isLast = null as
+            lastnl = '\n' == l
+            appendNl = if lastnl then (<> "\n") else id
 
 allComments :: Comments -> [Comment]
 allComments c =
diff --git a/tests/positive/Format.juvix b/tests/positive/Format.juvix
index 85d245f4a1..3ade7476bc 100644
--- a/tests/positive/Format.juvix
+++ b/tests/positive/Format.juvix
@@ -534,6 +534,22 @@ module MultiIf;
       | else := 2;
 end;
 
+{-hi
+
+-}
+module CommentAfterFun;
+  myfun (a : Nat) : Nat :=
+    {-
+    My comment.
+    -}
+    {-nospaces-}
+    {-    somespaces   -}
+    {-    first line
+
+    last line  -}
+    1;
+end;
+
 module PublicImports;
 
   module Inner;