diff --git a/mod/data/styles.css b/mod/data/styles.css
index fc6a8ae2283..955b3cdc7af 100644
--- a/mod/data/styles.css
+++ b/mod/data/styles.css
@@ -63,6 +63,7 @@
 #page-mod-data-templates .template_heading {
      text-align:center;
 }
+#page-mod-data-templates #availabletags_wrapper {max-width:250px;}
 
 .dir-rtl .mod-data-default-template .template-field {text-align:left;}
 .dir-rtl .mod-data-default-template .template-token {text-align:right;}
diff --git a/mod/data/templates.php b/mod/data/templates.php
index 236c23be17e..33fbf5ba9bb 100644
--- a/mod/data/templates.php
+++ b/mod/data/templates.php
@@ -234,7 +234,7 @@ if ($mode != 'csstemplate' and $mode != 'jstemplate') {
     echo $OUTPUT->help_icon('availabletags', 'data');
     echo '<br />';
 
-
+    echo '<div class="no-overflow" id="availabletags_wrapper">';
     echo '<select name="fields1[]" id="availabletags" size="12" onclick="insert_field_tags(this)">';
 
     $fields = $DB->get_records('data_fields', array('dataid'=>$data->id));
@@ -291,6 +291,7 @@ if ($mode != 'csstemplate' and $mode != 'jstemplate') {
     }
 
     echo '</select>';
+    echo '</div>';
     echo '<br /><br /><br /><br /><input type="submit" name="defaultform" value="'.get_string('resettemplate','data').'" />';
     echo '<br /><br />';
     if ($usehtmleditor) {