diff --git a/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/messages/MessagesTable.tsx b/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/messages/MessagesTable.tsx
index 89ac245..b0e19cd 100644
--- a/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/messages/MessagesTable.tsx
+++ b/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/messages/MessagesTable.tsx
@@ -18,7 +18,7 @@ import React, { useContext, useEffect, useState } from 'react'
 import { Column } from '../table/ArtemisTable';
 import { artemisService } from '../artemis-service';
 import { Toolbar, ToolbarContent, ToolbarItem, Text, SearchInput, Button, PaginationVariant, Pagination, DataList, DataListCell, DataListCheck, DataListItem, DataListItemCells, DataListItemRow, Modal, TextContent, Icon, ModalVariant } from '@patternfly/react-core';
-import { Thead, Tr, Th, Tbody, Td, ActionsColumn, IAction, Table } from '@patternfly/react-table';
+import { Thead, Tr, Th, Tbody, Td, ActionsColumn, IAction, Table, InnerScrollContainer } from '@patternfly/react-table';
 import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
 import { createQueueObjectName } from '../util/jmx';
 import { Link } from 'react-router-dom';
@@ -341,6 +341,7 @@ export const MessagesTable: React.FunctionComponent<MessageProps> = props => {
           </ToolbarItem>
         </ToolbarContent>
       </Toolbar>
+      <InnerScrollContainer>
       <Table id='message-table' variant="compact" aria-label="Column Management Table">
         <Thead>
           <Tr >
@@ -383,6 +384,7 @@ export const MessagesTable: React.FunctionComponent<MessageProps> = props => {
                 <td>
                   <ActionsColumn
                     items={getRowActions(row, rowIndex)}
+                    popperProps={{ position: 'right', appendTo: () => (document.getElementById('root') as HTMLElement) }}
                   />
                 </td>
               </>
@@ -390,6 +392,7 @@ export const MessagesTable: React.FunctionComponent<MessageProps> = props => {
           ))}
         </Tbody>
       </Table>
+      </InnerScrollContainer>
       <Pagination
         itemCount={resultsSize}
         page={page}
diff --git a/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/table/ArtemisTable.tsx b/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/table/ArtemisTable.tsx
index 624f732..0f32e41 100644
--- a/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/table/ArtemisTable.tsx
+++ b/artemis-console-extension/artemis-extension/src/artemis-extension/artemis/table/ArtemisTable.tsx
@@ -40,7 +40,7 @@ import {
   SelectList
 } from '@patternfly/react-core';
 import SortAmountDownIcon from '@patternfly/react-icons/dist/esm/icons/sort-amount-down-icon';
-import { Thead, Tr, Th, Tbody, Td, IAction, ActionsColumn, Table } from '@patternfly/react-table';
+import { Thead, Tr, Th, Tbody, Td, IAction, ActionsColumn, Table, InnerScrollContainer } from '@patternfly/react-table';
 import { artemisPreferencesService } from '../artemis-preferences-service';
 import {
   OptionsMenu,
@@ -435,6 +435,7 @@ const operationOptions = [
   return (
     <React.Fragment>
       {toolbarItems}
+      <InnerScrollContainer>
       <Table variant="compact" aria-label="Data Table" id='data-table'>
         <Thead>
           <Tr >
@@ -467,6 +468,7 @@ const operationOptions = [
                 <td>
                   <ActionsColumn
                     items={getRowActions(row, rowIndex)}
+                    popperProps={{ position: 'right', appendTo: () => (document.getElementById('root') as HTMLElement) }}
                   />
                 </td>
               </>
@@ -474,6 +476,7 @@ const operationOptions = [
           ))}
         </Tbody>
       </Table>
+      </InnerScrollContainer>
       {renderPagination(PaginationVariant.bottom)}
       {renderModal()}
     </React.Fragment>