diff --git a/lib/coffee_script/rewriter.rb b/lib/coffee_script/rewriter.rb
index 88a31066..0325f740 100644
--- a/lib/coffee_script/rewriter.rb
+++ b/lib/coffee_script/rewriter.rb
@@ -69,6 +69,10 @@ module CoffeeScript
           @tokens.delete_at(i + 2)
           @tokens.delete_at(i - 2)
           next 0
+        elsif prev[0] == "\n" && [:INDENT, :OUTDENT].include?(after[0])
+          @tokens.delete_at(i + 2)
+          @tokens[i - 1] = after
+          next 1
         elsif !["\n", :INDENT, :OUTDENT].include?(prev[0])
           @tokens.insert(i, ["\n", Value.new("\n", token[1].line)])
           next 2
diff --git a/test/fixtures/execution/test_funky_comments.coffee b/test/fixtures/execution/test_funky_comments.coffee
index 2a24318d..038c450a 100644
--- a/test/fixtures/execution/test_funky_comments.coffee
+++ b/test/fixtures/execution/test_funky_comments.coffee
@@ -1,8 +1,10 @@
+  # comment
 func: =>
+# comment
   false
   false   # comment
   false
 # comment
   true
-  
-print(func())
\ No newline at end of file
+
+print(func())