diff --git a/xblocks_contrib/word_cloud/templates/word_cloud.html b/xblocks_contrib/word_cloud/templates/word_cloud.html
index ec009a5..d2b2f14 100644
--- a/xblocks_contrib/word_cloud/templates/word_cloud.html
+++ b/xblocks_contrib/word_cloud/templates/word_cloud.html
@@ -2,7 +2,7 @@
 
 <div
     id="word_cloud_{{ element_id }}"
-    class="word_cloud_block">
+    class="{{ element_class }}">
     {% if display_name %}
         <h3 class="hd hd-3" id="word_cloud_{{ element_id }}_heading">{{ display_name }}</h3>
     {% endif %}
diff --git a/xblocks_contrib/word_cloud/word_cloud.py b/xblocks_contrib/word_cloud/word_cloud.py
index 027e4d5..4a8f106 100644
--- a/xblocks_contrib/word_cloud/word_cloud.py
+++ b/xblocks_contrib/word_cloud/word_cloud.py
@@ -131,6 +131,7 @@ def student_view(self, context=None):  # pylint: disable=W0613
             "templates/word_cloud.html", {
                 'display_name': self.display_name,
                 'instructions': self.instructions,
+                'element_class': self.scope_ids.usage_id.block_type,  #'word_cloud_block',
                 'element_id': self.scope_ids.usage_id.html_id(),
                 'num_inputs': self.num_inputs,
                 'range_num_inputs': range(self.num_inputs),