diff --git a/moodle/Sniffs/Files/BoilerplateCommentSniff.php b/moodle/Sniffs/Files/BoilerplateCommentSniff.php
index ab0f2ea..9eaed8c 100644
--- a/moodle/Sniffs/Files/BoilerplateCommentSniff.php
+++ b/moodle/Sniffs/Files/BoilerplateCommentSniff.php
@@ -233,8 +233,17 @@ private function fullComment(): array
 
     private function insertBoilerplate(File $file, int $stackptr): void
     {
-        $prefix = substr($file->getTokens()[$stackptr]['content'], -1) === "\n" ? '' : "\n";
-        $file->fixer->addContent($stackptr, $prefix . implode("\n", $this->fullComment()) . "\n");
+        $token = $file->getTokens()[$stackptr];
+        $paddedComment = implode("\n", $this->fullComment()) . "\n";
+
+        if ($token['code'] === T_OPEN_TAG) {
+            $replacement = trim($token['content']) . "\n" . $paddedComment;
+            $file->fixer->replaceToken($stackptr, $replacement);
+        } else {
+            $prefix = substr($token['content'], -1) === "\n" ? '' : "\n";
+            $file->fixer->addContent($stackptr, $prefix . $paddedComment);
+        }
+
     }
 
     private function moveBoilerplate(File $file, int $start, int $target): void
diff --git a/moodle/Tests/FilesBoilerPlateCommentTest.php b/moodle/Tests/FilesBoilerPlateCommentTest.php
index a15016a..5beb600 100644
--- a/moodle/Tests/FilesBoilerPlateCommentTest.php
+++ b/moodle/Tests/FilesBoilerPlateCommentTest.php
@@ -212,4 +212,18 @@ public function testMoodleFilesBoilerplateCommentTrailingWhitespaceMissing() {
 
         $this->verifyCsResults();
     }
+
+    public function testMoodleFilesBoilerplateCommentFirstlineComment() {
+        $this->setStandard('moodle');
+        $this->setSniff('moodle.Files.BoilerplateComment');
+        $this->setFixture(__DIR__ . '/fixtures/files/boilerplatecomment/firstline_comment.php');
+
+        $this->setErrors([
+            1 => 'NoBoilerplateComment',
+        ]);
+
+        $this->setWarnings([]);
+
+        $this->verifyCsResults();
+    }
 }
diff --git a/moodle/Tests/fixtures/files/boilerplatecomment/firstline_comment.php b/moodle/Tests/fixtures/files/boilerplatecomment/firstline_comment.php
new file mode 100644
index 0000000..e2915ff
--- /dev/null
+++ b/moodle/Tests/fixtures/files/boilerplatecomment/firstline_comment.php
@@ -0,0 +1,4 @@
+<?php // Some comment on first line.
+
+class test {
+}
diff --git a/moodle/Tests/fixtures/files/boilerplatecomment/firstline_comment.php.fixed b/moodle/Tests/fixtures/files/boilerplatecomment/firstline_comment.php.fixed
new file mode 100644
index 0000000..13bf7de
--- /dev/null
+++ b/moodle/Tests/fixtures/files/boilerplatecomment/firstline_comment.php.fixed
@@ -0,0 +1,19 @@
+<?php
+// This file is part of Moodle - https://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <https://www.gnu.org/licenses/>.
+// Some comment on first line.
+
+class test {
+}