diff --git a/web/pgadmin/utils/compile_template_name.py b/web/pgadmin/utils/compile_template_name.py
index 1232b6a09..1e0b94fa6 100644
--- a/web/pgadmin/utils/compile_template_name.py
+++ b/web/pgadmin/utils/compile_template_name.py
@@ -11,13 +11,10 @@ import os
 
 def compile_template_name(
         template_prefix, template_file_name, server_type, version):
-
-    # Template path concatenation should be same as
-    # Ref: ../pgadmin4/web/pgadmin/utils/versioned_template_loader.py +54
-    # to avoid path mismatch in windows
-    return compile_template_path(template_prefix, server_type, version) + \
-           '/' + template_file_name
-
+    return os.path.join(
+        compile_template_path(template_prefix, server_type, version),
+        template_file_name
+    )
 
 
 def compile_template_path(template_prefix, server_type, version):
@@ -25,8 +22,4 @@ def compile_template_path(template_prefix, server_type, version):
         version_path = '#{0}#{1}#'.format(server_type, version)
     else:
         version_path = '#{0}#'.format(version)
-
-    # Template path concatenation should be same as
-    # Ref: ../pgadmin4/web/pgadmin/utils/versioned_template_loader.py +54
-    # to avoid path mismatch in windows
-    return template_prefix + '/' + version_path
+    return os.path.join(template_prefix, version_path)