diff --git a/lib/SimpleSAML/XHTML/Template.php b/lib/SimpleSAML/XHTML/Template.php
index 38a8066c3083d6d5377d31062b02ec8d772313c6..77a07c649992516b4a169839fa7d8986f462d09f 100644
--- a/lib/SimpleSAML/XHTML/Template.php
+++ b/lib/SimpleSAML/XHTML/Template.php
@@ -172,6 +172,9 @@ class SimpleSAML_XHTML_Template
         if ($this->module) {
             $templateDirs[] = array($this->module => $this->getModuleTemplateDir($this->module));
         }
+        if ($this->theme['module']) {
+            $templateDirs[] = array($this->theme['module'] => $this->getModuleTemplateDir($this->theme['module']));
+        }
 
         // default, themeless templates are checked last
         $templateDirs[] = array(