diff --git a/cms/djangoapps/contentstore/views/component.py b/cms/djangoapps/contentstore/views/component.py
index 34c1f465c566..470d4274d1b0 100644
--- a/cms/djangoapps/contentstore/views/component.py
+++ b/cms/djangoapps/contentstore/views/component.py
@@ -43,6 +43,12 @@
 from xmodule.modulestore.django import modulestore  # lint-amnesty, pylint: disable=wrong-import-order
 from xmodule.modulestore.exceptions import ItemNotFoundError  # lint-amnesty, pylint: disable=wrong-import-order
 
+try:
+    from games.toggles import is_games_xblock_enabled  # pylint: disable=import-error
+except ImportError:
+    def is_games_xblock_enabled():
+        return False
+
 __all__ = [
     'container_handler',
     'component_handler',
@@ -63,6 +69,8 @@
     'openassessment',
     'drag-and-drop-v2',
 ]
+if is_games_xblock_enabled():
+    COMPONENT_TYPES.append('games')
 
 BETA_COMPONENT_TYPES = ['library_v2', 'itembank']
 
@@ -288,6 +296,8 @@ def create_support_legend_dict():
         'itembank': _("Problem Bank"),
         'drag-and-drop-v2': _("Drag and Drop"),
     }
+    if is_games_xblock_enabled():
+        component_display_names['games'] = _("Games")
 
     component_templates = []
     categories = set()
diff --git a/cms/static/images/large-games-icon.svg b/cms/static/images/large-games-icon.svg
new file mode 100644
index 000000000000..9c862ef6c194
--- /dev/null
+++ b/cms/static/images/large-games-icon.svg
@@ -0,0 +1,10 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_11387_43979)">
+<path d="M19 5H17V3H7V5H5C3.9 5 3 5.9 3 7V8C3 10.55 4.92 12.63 7.39 12.94C8.02 14.44 9.37 15.57 11 15.9V19H7V21H17V19H13V15.9C14.63 15.57 15.98 14.44 16.61 12.94C19.08 12.63 21 10.55 21 8V7C21 5.9 20.1 5 19 5ZM5 8V7H7V10.82C5.84 10.4 5 9.3 5 8ZM19 8C19 9.3 18.16 10.4 17 10.82V7H19V8Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_11387_43979">
+<rect width="24" height="24" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/cms/static/js/views/pages/container.js b/cms/static/js/views/pages/container.js
index d50f6b4bbe4a..9f8c5ddc6d51 100644
--- a/cms/static/js/views/pages/container.js
+++ b/cms/static/js/views/pages/container.js
@@ -512,6 +512,7 @@ function($, _, Backbone, gettext, BasePage,
                 if((useNewTextEditor === 'True' && blockType === 'html')
                         || (useNewVideoEditor === 'True' && blockType === 'video')
                         || (useNewProblemEditor === 'True' && blockType === 'problem')
+                        || (blockType === 'games')
                 ) {
                     var destinationUrl = primaryHeader.attr('authoring_MFE_base_url')
                         + '/' + blockType
diff --git a/cms/static/sass/assets/_graphics.scss b/cms/static/sass/assets/_graphics.scss
index afb830d5dd71..58141c445a75 100644
--- a/cms/static/sass/assets/_graphics.scss
+++ b/cms/static/sass/assets/_graphics.scss
@@ -80,3 +80,9 @@
   height: ($baseline*3);
   background: url('#{$static-path}/images/large-itembank-icon.png') center no-repeat;
 }
+
+.large-games-icon {
+  display: inline-block;
+  width: ($baseline*3);
+  height: ($baseline*3);
+  background: url('#{$static-path}/images/large-games-icon.svg') center no-repeat; }