diff --git a/typo3/sysext/backend/Classes/View/BackendLayout/Grid/GridColumn.php b/typo3/sysext/backend/Classes/View/BackendLayout/Grid/GridColumn.php
index 3750fd7de332a96f52b992f096b19fbcd759672a..f9f6687df91421edccb825dc9f16924061029481 100644
--- a/typo3/sysext/backend/Classes/View/BackendLayout/Grid/GridColumn.php
+++ b/typo3/sysext/backend/Classes/View/BackendLayout/Grid/GridColumn.php
@@ -157,7 +157,7 @@ class GridColumn extends AbstractGridObject
         }
         $pageRecord = $this->backendLayout->getDrawingConfiguration()->getPageRecord();
         if (!$this->getBackendUser()->doesUserHaveAccess($pageRecord, Permission::CONTENT_EDIT)
-            && !$this->getBackendUser()->checkLanguageAccess(0)) {
+            || !$this->getBackendUser()->checkLanguageAccess($this->backendLayout->getDrawingConfiguration()->getLanguageColumnsPointer())) {
             return null;
         }
         $pageTitleParamForAltDoc = '&recTitle=' . rawurlencode(
diff --git a/typo3/sysext/backend/Classes/View/BackendLayout/Grid/GridColumnItem.php b/typo3/sysext/backend/Classes/View/BackendLayout/Grid/GridColumnItem.php
index dd39aa9200f03f5fb43e2cd33dd6f4f4481b88f6..fce6c53d3768f425f57c2c039855d86abc6e4a8b 100644
--- a/typo3/sysext/backend/Classes/View/BackendLayout/Grid/GridColumnItem.php
+++ b/typo3/sysext/backend/Classes/View/BackendLayout/Grid/GridColumnItem.php
@@ -152,12 +152,16 @@ class GridColumnItem extends AbstractGridObject
         $row = $this->record;
         $icons = [];
 
+        $toolTip = BackendUtility::getRecordToolTip($row, $table);
+        $icon = '<span ' . $toolTip . '>' . $this->iconFactory->getIconForRecord($table, $row, Icon::SIZE_SMALL)->render() . '</span>';
         if ($this->getBackendUser()->recordEditAccessInternals($table, $row)) {
-            $toolTip = BackendUtility::getRecordToolTip($row, $table);
-            $icon = '<span ' . $toolTip . '>' . $this->iconFactory->getIconForRecord($table, $row, Icon::SIZE_SMALL)->render() . '</span>';
-            $icons[] = BackendUtility::wrapClickMenuOnIcon($icon, $table, $row['uid']);
+            $icon = BackendUtility::wrapClickMenuOnIcon($icon, $table, $row['uid']);
+        }
+        $icons[] = $icon;
+        $siteLanguage = $this->backendLayout->getDrawingConfiguration()->getSiteLanguage((int)$row['sys_language_uid']);
+        if ($siteLanguage instanceof SiteLanguage) {
+            $icons[] = $this->renderLanguageFlag($siteLanguage);
         }
-        $icons[] = $this->renderLanguageFlag($this->backendLayout->getDrawingConfiguration()->getSiteLanguage((int)$row['sys_language_uid']));
 
         if ($lockInfo = BackendUtility::isRecordLocked('tt_content', $row['uid'])) {
             $icons[] = '<a href="#" data-toggle="tooltip" data-title="' . htmlspecialchars($lockInfo['msg']) . '">'