diff --git a/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php b/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
index fd17136aad1639386428a3972bc67441444f068a..840321c4a0f4a1c28285b6f82cc2decca3699aef 100644
--- a/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
+++ b/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
@@ -1143,7 +1143,7 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
 			}
 			$this->getDatabaseConnection()->sql_free_result($res);
 
-			$this->view->assign('table', '<table class="table table-striped table-hover">' . implode(LF, $table) . '</table>');
+			$this->view->assign('table', '<div class="table-fit"><table class="table table-striped table-hover">' . implode(LF, $table) . '</table></div>');
 
 			// Server date time
 			$dateFormat = $GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy'] . ' ' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['hhmm'] . ' T (e';
diff --git a/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/InfoScreen.html b/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/InfoScreen.html
index 4a5744b8589c3189d86f21329b2afe1e70a19f70..c6be71b59cc59e0fb745bfb5f75032156c47c8c3 100644
--- a/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/InfoScreen.html
+++ b/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/InfoScreen.html
@@ -3,35 +3,36 @@
 <p class="lead">
 	<f:translate key="msg.infoScreenIntro" />
 </p>
-
-<table class="table table-striped table-hover">
-	<thead>
-		<tr>
-			<th>
-				<f:translate key="label.name" />
-			</th>
-			<th>
-				<f:translate key="label.extension" />
-			</th>
-			<th colspan="2">
-				<f:translate key="label.description" />
-			</th>
-		</tr>
-	</thead>
-	<tbody>
-		<f:for each="{registeredClasses}" key="class" as="classInfo">
+<div class="table-responsive">
+	<table class="table table-striped table-hover">
+		<thead>
 			<tr>
-				<td>{classInfo.title}</td>
-				<td>{classInfo.extension}</td>
-				<td>{classInfo.description}</td>
-				<td>
-					<div class="btn-group" role="group">
-						<span class="btn btn-default">
-							<f:be.buttons.icon uri="{s:moduleLink(controller:'scheduler', action: 'add', arguments: '{class: class}')}" icon="actions-document-new" title="{f:translate(key:'LLL:EXT:lang/locallang_common.xlf:new')}"/>
-						</span>
-					</div>
-				</td>
+				<th>
+					<f:translate key="label.name" />
+				</th>
+				<th>
+					<f:translate key="label.extension" />
+				</th>
+				<th colspan="2">
+					<f:translate key="label.description" />
+				</th>
 			</tr>
-		</f:for>
-	</tbody>
-</table>
+		</thead>
+		<tbody>
+			<f:for each="{registeredClasses}" key="class" as="classInfo">
+				<tr>
+					<td>{classInfo.title}</td>
+					<td>{classInfo.extension}</td>
+					<td>{classInfo.description}</td>
+					<td>
+						<div class="btn-group" role="group">
+							<span class="btn btn-default">
+								<f:be.buttons.icon uri="{s:moduleLink(controller:'scheduler', action: 'add', arguments: '{class: class}')}" icon="actions-document-new" title="{f:translate(key:'LLL:EXT:lang/locallang_common.xlf:new')}"/>
+							</span>
+						</div>
+					</td>
+				</tr>
+			</f:for>
+		</tbody>
+	</table>
+</div>
\ No newline at end of file