diff --git a/library/Icinga/Application/Modules/Manager.php b/library/Icinga/Application/Modules/Manager.php
index a6ca914da..c0e835c8d 100644
--- a/library/Icinga/Application/Modules/Manager.php
+++ b/library/Icinga/Application/Modules/Manager.php
@@ -331,6 +331,10 @@ class Manager
      */
     public function getModuleDir($name, $subdir = '')
     {
+        if ($this->hasLoaded($name)) {
+            return $this->getModule($name)->getBaseDir() . $subdir;
+        }
+
         if ($this->hasEnabled($name)) {
             return $this->enabledDirs[$name]. $subdir;
         }