diff --git a/src/View/Http/InjectTemplateListener.php b/src/View/Http/InjectTemplateListener.php
index 3b110a787..f6cb130ed 100644
--- a/src/View/Http/InjectTemplateListener.php
+++ b/src/View/Http/InjectTemplateListener.php
@@ -172,8 +172,9 @@ protected function deriveControllerClass($controller)
             $controller = substr($controller, strrpos($controller, '\\') + 1);
         }
 
-        if ((10 < strlen($controller))
-            && ('Controller' == substr($controller, -10))
+        $length = strlen($controller);
+        if ($length > 10
+            && strrpos($controller, 'Controller') === $length - 10
         ) {
             $controller = substr($controller, 0, -10);
         }