diff --git a/src/plugins/discover/public/application/components/doc_viewer/doc_viewer.scss b/src/plugins/discover/public/application/components/doc_viewer/doc_viewer.scss
index 95a50b54b536..f5a4180207c3 100644
--- a/src/plugins/discover/public/application/components/doc_viewer/doc_viewer.scss
+++ b/src/plugins/discover/public/application/components/doc_viewer/doc_viewer.scss
@@ -1,5 +1,5 @@
 .kbnDocViewerTable {
-  @include euiBreakpoint('xs', 's') {
+  @include euiBreakpoint('xs', 's','m') {
     table-layout: fixed;
   }
 }
@@ -52,7 +52,7 @@
   white-space: nowrap;
 }
 .kbnDocViewer__buttons {
-  width: 96px;
+  width: 108px;
 
   // Show all icons if one is focused,
   &:focus-within {
@@ -64,7 +64,7 @@
 
 .kbnDocViewer__field {
   width: $euiSize * 10;
-  @include euiBreakpoint('xs', 's') {
+  @include euiBreakpoint('xs', 's', 'm') {
     width: $euiSize * 6;
   }
 }
diff --git a/src/plugins/discover/public/application/components/table/table_row.tsx b/src/plugins/discover/public/application/components/table/table_row.tsx
index 731dbeed85cc..5c6ae49770bc 100644
--- a/src/plugins/discover/public/application/components/table/table_row.tsx
+++ b/src/plugins/discover/public/application/components/table/table_row.tsx
@@ -54,6 +54,26 @@ export function DocViewTableRow({
   const key = field ? field : fieldMapping?.displayName;
   return (
     <tr key={key} data-test-subj={`tableDocViewRow-${key}`}>
+      {typeof onFilter === 'function' && (
+        <td className="kbnDocViewer__buttons">
+          <DocViewTableRowBtnFilterAdd
+            disabled={!fieldMapping || !fieldMapping.filterable}
+            onClick={() => onFilter(fieldMapping, valueRaw, '+')}
+          />
+          <DocViewTableRowBtnFilterRemove
+            disabled={!fieldMapping || !fieldMapping.filterable}
+            onClick={() => onFilter(fieldMapping, valueRaw, '-')}
+          />
+          {typeof onToggleColumn === 'function' && (
+            <DocViewTableRowBtnToggleColumn active={isColumnActive} onClick={onToggleColumn} />
+          )}
+          <DocViewTableRowBtnFilterExists
+            disabled={!fieldMapping || !fieldMapping.filterable}
+            onClick={() => onFilter('_exists_', field, '+')}
+            scripted={fieldMapping && fieldMapping.scripted}
+          />
+        </td>
+      )}
       <td className="kbnDocViewer__field">
         {field ? (
           <FieldName
@@ -83,26 +103,6 @@ export function DocViewTableRow({
           dangerouslySetInnerHTML={{ __html: value as string }}
         />
       </td>
-      {typeof onFilter === 'function' && (
-        <td className="kbnDocViewer__buttons">
-          <DocViewTableRowBtnFilterAdd
-            disabled={!fieldMapping || !fieldMapping.filterable}
-            onClick={() => onFilter(fieldMapping, valueRaw, '+')}
-          />
-          <DocViewTableRowBtnFilterRemove
-            disabled={!fieldMapping || !fieldMapping.filterable}
-            onClick={() => onFilter(fieldMapping, valueRaw, '-')}
-          />
-          {typeof onToggleColumn === 'function' && (
-            <DocViewTableRowBtnToggleColumn active={isColumnActive} onClick={onToggleColumn} />
-          )}
-          <DocViewTableRowBtnFilterExists
-            disabled={!fieldMapping || !fieldMapping.filterable}
-            onClick={() => onFilter('_exists_', field, '+')}
-            scripted={fieldMapping && fieldMapping.scripted}
-          />
-        </td>
-      )}
     </tr>
   );
 }