diff --git a/administrator/components/com_patchtester/src/Model/PullModel.php b/administrator/components/com_patchtester/src/Model/PullModel.php
index 1965ff63..f5fe51be 100644
--- a/administrator/components/com_patchtester/src/Model/PullModel.php
+++ b/administrator/components/com_patchtester/src/Model/PullModel.php
@@ -783,17 +783,18 @@ private function parseFileList(array $files): array
             $filePath            = explode('/', $prodFileName);
             // Remove the `src` here to match the CMS paths if needed
             if ($filePath[0] === 'src') {
-                $prodFileName = str_replace('src/', '', $prodFileName);
+                $prodFileName = preg_replace('/^src\\//', '', $prodFileName, 1);
             }
 
             if ($prodRenamedFileName) {
                 $filePath = explode('/', $prodRenamedFileName);
                 // Remove the `src` here to match the CMS paths if needed
                 if ($filePath[0] === 'src') {
-                    $prodRenamedFileName = str_replace(
-                        'src/',
+                    $prodRenamedFileName = preg_replace(
+                        '/^src\\//',
                         '',
-                        $prodRenamedFileName
+                        $prodRenamedFileName,
+                        1
                     );
                 }
             }
diff --git a/administrator/components/com_patchtester/tmpl/pulls/default_items.php b/administrator/components/com_patchtester/tmpl/pulls/default_items.php
index 07e469ef..bb45e04c 100644
--- a/administrator/components/com_patchtester/tmpl/pulls/default_items.php
+++ b/administrator/components/com_patchtester/tmpl/pulls/default_items.php
@@ -137,27 +137,27 @@
             endif; ?>
       </td>
       <td class="text-center">
-          <?php $hideButton = function($labels) {
-                foreach ($labels as $label) {
-                    if (in_array(strtolower($label->name), ['npm resource changed', 'composer dependency changed', 'rtc'])) {
-                        return true;
-                    }
-                }
+          <?php $hideButton = function ($labels) {
+    foreach ($labels as $label) {
+        if (in_array(strtolower($label->name), ['npm resource changed', 'composer dependency changed', 'rtc'])) {
+            return true;
+        }
+    }
 
                 return false;
           };?>
           <?php if ($this->settings->get('advanced', 0) || !$hideButton($item->labels)) : ?>
-              <?php if ($item->applied) :
-                  ?>
+                <?php if ($item->applied) :
+                    ?>
                   <button type="button" class="btn btn-sm btn-success submitPatch"
                           data-task="revert" data-id="<?php echo (int) $item->applied; ?>"><?php echo Text::_('COM_PATCHTESTER_REVERT_PATCH'); ?></button>
-                  <?php
-              else :
-                  ?>
+                    <?php
+                else :
+                    ?>
                 <button type="button" class="btn btn-sm btn-primary submitPatch"
                           data-task="apply" data-id="<?php echo (int) $item->pull_id; ?>"><?php echo Text::_('COM_PATCHTESTER_APPLY_PATCH'); ?></button>
-                  <?php
-              endif; ?>
+                    <?php
+                endif; ?>
           <?php endif; ?>
       </td>
   </tr>