diff --git a/cms/static/sass/_header.scss b/cms/static/sass/_header.scss
index 8744b4d307..eac712c4e5 100644
--- a/cms/static/sass/_header.scss
+++ b/cms/static/sass/_header.scss
@@ -109,15 +109,17 @@
     width: 1px;
   }
 
-  .course-number, .course-title {
-    display: block;
+  .course-org {
+    margin-right: ($baseline/4);
   }
 
-  .course-number {
+  .course-number, .course-org {
     @include font-size(12);
+    display: inline-block;
   }
 
   .course-title {
+    display: block;
     width: 100%;
     max-width: 220px;
     overflow: hidden;
diff --git a/cms/templates/widgets/header.html b/cms/templates/widgets/header.html
index c664669ead..230c658f31 100644
--- a/cms/templates/widgets/header.html
+++ b/cms/templates/widgets/header.html
@@ -11,7 +11,7 @@
       <div class="info-course">
         <h2 class="sr">Current Course:</h2>
         <a href="${reverse('course_index', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">
-        <span class="course-number">PH207x:</span>
+        <span class="course-org">${ctx_loc.org}</span><span class="course-number">${ctx_loc.course}</span>
         <span class="course-title" title="${context_course.display_name}">${context_course.display_name}</span>
         </a>
       </div>