diff --git a/cms/envs/common.py b/cms/envs/common.py
index bcd96c52b4..af89b610c3 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -1006,6 +1006,8 @@ ADVANCED_COMPONENT_TYPES = [
     'pb-dashboard',
     'poll',
     'survey',
+    'activetable',
+    'vectordraw',
     # Some of the XBlocks from pmitros repos are sometimes prototypes.
     # Use with caution.
     'concept',  # Concept mapper. See https://github.com/pmitros/ConceptXBlock
diff --git a/lms/templates/staff_problem_info.html b/lms/templates/staff_problem_info.html
index 96d06ac684..c422c9839c 100644
--- a/lms/templates/staff_problem_info.html
+++ b/lms/templates/staff_problem_info.html
@@ -6,6 +6,7 @@ from django.template.defaultfilters import escapejs
 
 ## The JS for this is defined in xqa_interface.html
 ${block_content}
+%if location.category in ['problem','video','html','combinedopenended','graphical_slider_tool', 'library_content']:
 %  if edit_link:
   <div>
       <a href="${edit_link}">Edit</a>
@@ -141,3 +142,5 @@ $(function () {
     );
 });
 </script>
+%endif
+