diff --git a/mod/choice/renderer.php b/mod/choice/renderer.php
index 613ecf1390a..1c1409feb32 100644
--- a/mod/choice/renderer.php
+++ b/mod/choice/renderer.php
@@ -202,8 +202,7 @@ class mod_choice_renderer extends plugin_renderer_base {
         foreach ($columns as $d) {
             $table->colclasses[] = 'data';
         }
-        
-        $html .= html_writer::table($table);
+        $html .= html_writer::tag('div', html_writer::table($table), array('class'=>'response'));
         
         $actiondata = '';
         if ($choices->viewresponsecapability && $choices->deleterepsonsecapability) {            
@@ -229,8 +228,8 @@ class mod_choice_renderer extends plugin_renderer_base {
         if ($choices->viewresponsecapability) {
             $html .= html_writer::end_tag('form');
         }
-        
-        return $html;        
+       
+        return $html;
     }
 
 
@@ -315,9 +314,9 @@ class mod_choice_renderer extends plugin_renderer_base {
         
         $header = html_writer::tag('h2',format_string(get_string("responses", "choice")));
         $html .= html_writer::tag('div', $header, array('class'=>'responseheader'));
-        $html .= html_writer::tag('a', get_string('skipresultgraph', 'choice'), array('href'=>'#skipresultgraph', 'class'=>'skip-block'));
-        $html .= html_writer::table($table);
-        
+        $html .= html_writer::tag('a', get_string('skipresultgraph', 'choice'), array('href'=>'#skipresultgraph', 'class'=>'skip-block'));      
+        $html .= html_writer::tag('div', html_writer::table($table), array('class'=>'response'));      
+
         return $html;
     }
 
diff --git a/mod/choice/styles.css b/mod/choice/styles.css
index 5e1c246f2ea..c13f20fcceb 100644
--- a/mod/choice/styles.css
+++ b/mod/choice/styles.css
@@ -33,6 +33,8 @@
 .path-mod-choice .results.names .user .fullname{padding-left: 5px;}
 .path-mod-choice .results .data.header {width: 10%;}
 .path-mod-choice .responseaction {text-align: center;}
+.path-mod-choice .results .option {white-space: normal;}
+.path-mod-choice .response {overflow: auto;}
 
 #page-mod-choice-report .downloadreport ul li {list-style:none;padding: 0 20px; display: inline;float: left; }
 .path-mod-choice .clearfloat {float:none; clear:both;}
diff --git a/theme/canvas/style/mods.css b/theme/canvas/style/mods.css
index f59fd8815ba..b3c6e168a1d 100644
--- a/theme/canvas/style/mods.css
+++ b/theme/canvas/style/mods.css
@@ -335,13 +335,13 @@
 	padding: 5px;
 }
 
-.path-mod-choice .header, .path-mod-choice td {
+.path-mod-choice .results .header, .path-mod-choice td {
 	border-top: 1px solid;
 	border-color: #ddd;
 }
 
 .path-mod-choice .count,
-.path-mod-choice .header,
+.path-mod-choice .results .header,
 .path-mod-choice .data,
 .path-mod-choice .lastcol {
 	border-right: 1px solid #ddd;