diff --git a/cms/djangoapps/contentstore/views/component.py b/cms/djangoapps/contentstore/views/component.py
index 470d4274d1b0..82db51f958fe 100644
--- a/cms/djangoapps/contentstore/views/component.py
+++ b/cms/djangoapps/contentstore/views/component.py
@@ -69,11 +69,13 @@ def is_games_xblock_enabled():
     'openassessment',
     'drag-and-drop-v2',
 ]
-if is_games_xblock_enabled():
-    COMPONENT_TYPES.append('games')
 
 BETA_COMPONENT_TYPES = ['library_v2', 'itembank']
 
+if is_games_xblock_enabled():
+    COMPONENT_TYPES.append('games')
+    BETA_COMPONENT_TYPES.append('games')
+
 ADVANCED_COMPONENT_TYPES = sorted({name for name, class_ in XBlock.load_classes()} - set(COMPONENT_TYPES))
 
 ADVANCED_PROBLEM_TYPES = settings.ADVANCED_PROBLEM_TYPES
diff --git a/cms/static/js/views/pages/container.js b/cms/static/js/views/pages/container.js
index 9f8c5ddc6d51..88a0f3397f2a 100644
--- a/cms/static/js/views/pages/container.js
+++ b/cms/static/js/views/pages/container.js
@@ -301,6 +301,12 @@ function($, _, Backbone, gettext, BasePage,
             this.xblockView.refresh(xblockView, block_added, is_duplicate);
             // Update publish and last modified information from the server.
             this.model.fetch();
+
+            // Auto-open editor for games blocks when first added
+            if (block_added && !is_duplicate && xblockView && xblockView.$el &&
+                xblockView.$el.find('.xblock-header-primary').attr('data-block-type') === 'games') {
+                setTimeout(function() { xblockView.$el.find('.edit-button').first().trigger('click'); }, 500);
+            }
         },
 
         renderAddXBlockComponents: function() {