diff --git a/typo3/sysext/lang/Resources/Private/Language/locallang_browse_links.xlf b/typo3/sysext/lang/Resources/Private/Language/locallang_browse_links.xlf
index be1868e6a9dd6da0a9433173d9ee582273ec57ca..f7fe96692031c4fbfbe411f71d41b57131be8508 100644
--- a/typo3/sysext/lang/Resources/Private/Language/locallang_browse_links.xlf
+++ b/typo3/sysext/lang/Resources/Private/Language/locallang_browse_links.xlf
@@ -117,6 +117,9 @@
 			<trans-unit id="folderSelector">
 				<source>Folder selector</source>
 			</trans-unit>
+			<trans-unit id="page_id">
+				<source>Page ID</source>
+			</trans-unit>
 		</body>
 	</file>
 </xliff>
diff --git a/typo3/sysext/recordlist/Classes/LinkHandler/PageLinkHandler.php b/typo3/sysext/recordlist/Classes/LinkHandler/PageLinkHandler.php
index 2999fdde51037c391ccb8134c1356b478fa1837a..15f6a6e0e11705adea6ee559640087dc5d68e60f 100644
--- a/typo3/sysext/recordlist/Classes/LinkHandler/PageLinkHandler.php
+++ b/typo3/sysext/recordlist/Classes/LinkHandler/PageLinkHandler.php
@@ -279,17 +279,17 @@ class PageLinkHandler extends AbstractLinkHandler implements LinkHandlerInterfac
         if (!empty($configuration['pageIdSelector.']['enabled'])) {
             $this->linkAttributes[] = 'pageIdSelector';
             $fieldDefinitions['pageIdSelector'] = '
-				<tr>
-					<td>
-						<label>
-							' . htmlspecialchars($this->getLanguageService()->getLL('page_id')) . ':
+				<form class="form-horizontal"><div class="form-group form-group-sm">
+					<label class="col-xs-4 control-label">
+						' . htmlspecialchars($this->getLanguageService()->getLL('page_id')) . '
 						</label>
-					</td>
-					<td colspan="3">
-						<input type="text" size="6" name="luid" id="luid" /> <input class="btn btn-default t3js-pageLink" type="submit" value="'
-            . htmlspecialchars($this->getLanguageService()->getLL('setLink')) . '" />
-					</td>
-				</tr>';
+					<div class="col-xs-2">
+						<input type="number" size="6" name="luid" id="luid" class="form-control" />
+					</div>
+					<div class="col-xs-6">
+						<input class="btn btn-default t3js-pageLink" type="submit" value="' . htmlspecialchars($this->getLanguageService()->getLL('setLink')) . '" />
+					</div>
+				</div></form>';
         }
         return $fieldDefinitions;
     }