diff --git a/src/plugins/logs/index.js b/src/plugins/logs/index.js index 1f0d73a94..aac0d6338 100644 --- a/src/plugins/logs/index.js +++ b/src/plugins/logs/index.js @@ -602,7 +602,8 @@ export default class LogTable extends FlipperDevicePlugin< defaultFilters={DEFAULT_FILTERS} zebra={false} actions={} - stickyBottom={true} + // If the logs is opened through deeplink, then don't scroll as the row is highlighted + stickyBottom={!this.props.deepLinkPayload} /> {this.renderSidebar()} diff --git a/src/ui/components/table/ManagedTable.js b/src/ui/components/table/ManagedTable.js index a12d4f5cc..0479141f3 100644 --- a/src/ui/components/table/ManagedTable.js +++ b/src/ui/components/table/ManagedTable.js @@ -186,7 +186,9 @@ class ManagedTable extends React.Component< const index = nextProps.rows.findIndex( ({key}) => key === Array.from(highlightedRows)[0], ); - current.scrollToItem(index); + if (index >= 0) { + current.scrollToItem(index); + } } }