diff --git a/pkg/plugins/frontend_plugin.go b/pkg/plugins/frontend_plugin.go
index 1e20db1e7f5..0f0d1676066 100644
--- a/pkg/plugins/frontend_plugin.go
+++ b/pkg/plugins/frontend_plugin.go
@@ -3,6 +3,7 @@ package plugins
 import (
 	"net/url"
 	"path"
+	"path/filepath"
 )
 
 type FrontendPluginBase struct {
@@ -14,7 +15,7 @@ type FrontendPluginBase struct {
 func (fp *FrontendPluginBase) initFrontendPlugin() {
 	if fp.StaticRoot != "" {
 		StaticRoutes = append(StaticRoutes, &PluginStaticRoute{
-			Directory: fp.StaticRoot,
+			Directory: filepath.Join(fp.PluginDir, fp.StaticRoot),
 			PluginId:  fp.Id,
 		})
 	}
@@ -31,7 +32,7 @@ func (fp *FrontendPluginBase) handleModuleDefaults() {
 	}
 
 	if fp.StaticRoot != "" {
-		fp.Module = path.Join("plugins", fp.Type, fp.Id, "module")
+		fp.Module = path.Join("plugins", fp.Id, "module")
 		return
 	}