diff --git a/content/content-tool/tool/src/webapp/vm/content/sakai_resources_list.vm b/content/content-tool/tool/src/webapp/vm/content/sakai_resources_list.vm
index 9297f3629f5a..10a990c2a319 100644
--- a/content/content-tool/tool/src/webapp/vm/content/sakai_resources_list.vm
+++ b/content/content-tool/tool/src/webapp/vm/content/sakai_resources_list.vm
@@ -250,6 +250,7 @@
     <div id="userId" style="display: none;">$userId</div>
 		######################  Heirarchical list of resource folders/items  ##############
     ## style on table to override margin on small viewports
+		<div class="table-responsive">
 		<table style="margin:0;width:100%;display:table" class="table table-striped table-hover #if (!$dropboxMode) resourcesList #end" cellspacing="0" border="0"  summary="$clang.getString("sh.listsum")">
 			######################  Column labels, sort controls, expand/collapse all  ##############
 			<caption class="skip"  style="display:none">$clang.getString("sh.listcap")</caption>
@@ -784,6 +785,7 @@
 			############################################# end of "Other sites" section 
 		
 		</table>
+		</div>
 		
 		#foreach($key in $listActions.keySet())
 			<input type="hidden" id="${key}-count" value="$counter.getValue("${key}selected")" />
diff --git a/samigo/samigo-app/src/webapp/jsf/author/authorIndex_content.jsp b/samigo/samigo-app/src/webapp/jsf/author/authorIndex_content.jsp
index 709f05fbd07f..bb58440af737 100644
--- a/samigo/samigo-app/src/webapp/jsf/author/authorIndex_content.jsp
+++ b/samigo/samigo-app/src/webapp/jsf/author/authorIndex_content.jsp
@@ -297,6 +297,7 @@
             <h:panelGroup rendered="#{author.allAssessments.size() == 0}">
                 <h:outputText value="#{authorFrontDoorMessages.datatables_zeroRecords}" styleClass="sak-banner-info" />
             </h:panelGroup>
+	    <div class="table-responsive">
             <t:dataTable cellpadding="0" cellspacing="0" rowClasses="list-row-even,list-row-odd" styleClass="table table-hover table-striped table-bordered table-assessments" id="coreAssessments" value="#{author.allAssessments}" var="assessment" rendered="#{author.allAssessments.size() > 0}" summary="#{authorFrontDoorMessages.sum_coreAssessment}">
                 <%/* Title */%>
                 <t:column headerstyleClass="titlePending" styleClass="titlePending">
@@ -654,6 +655,7 @@
                 <t:column rendered="#{!authorization.deleteAnyAssessment and !authorization.deleteOwnAssessment}" headerstyleClass="d-none" styleClass="d-none">
                 </t:column>
             </t:dataTable>
+	    </div>
 
             <div class="clearfix"></div>