diff --git a/glslang/HLSL/hlslParseHelper.cpp b/glslang/HLSL/hlslParseHelper.cpp
index 0732334055..fe06594afa 100644
--- a/glslang/HLSL/hlslParseHelper.cpp
+++ b/glslang/HLSL/hlslParseHelper.cpp
@@ -10284,4 +10284,14 @@ void HlslParseContext::finish()
     TParseContextBase::finish();
 }
 
+
+const char* HlslParseContext::getGlobalUniformBlockName() const
+{
+    const char* name = intermediate.getGlobalUniformBlockName();
+    if (std::string(name) == "")
+        return "$Global";
+    else
+        return name;
+}
+
 } // end namespace glslang
diff --git a/glslang/HLSL/hlslParseHelper.h b/glslang/HLSL/hlslParseHelper.h
index 97c52d453a..c2f4db721c 100644
--- a/glslang/HLSL/hlslParseHelper.h
+++ b/glslang/HLSL/hlslParseHelper.h
@@ -57,7 +57,7 @@ class HlslParseContext : public TParseContextBase {
 
     void setLimits(const TBuiltInResource&) override;
     bool parseShaderStrings(TPpContext&, TInputScanner& input, bool versionWillBeError = false) override;
-    virtual const char* getGlobalUniformBlockName() const override { return "$Global"; }
+    virtual const char* getGlobalUniformBlockName() const override;
     virtual void setUniformBlockDefaults(TType& block) const override
     {
         block.getQualifier().layoutPacking = globalUniformDefaults.layoutPacking;