diff --git a/src/components/Dashboard/common/ObjectTableNavigationButtons.jsx b/src/components/Dashboard/common/ObjectTableNavigationButtons.jsx
index b04c843..e203d60 100644
--- a/src/components/Dashboard/common/ObjectTableNavigationButtons.jsx
+++ b/src/components/Dashboard/common/ObjectTableNavigationButtons.jsx
@@ -7,6 +7,7 @@ import PropTypes from 'prop-types'
import { ApiServerContext } from '../context/ApiServerContext'
import { AuthContext } from '../context/AuthContext'
import { useTableStatePersistence } from '../context/TableStateContext'
+import KeyboardShortcut from './KeyboardShortcut.jsx'
const ObjectTableNavigationButtons = ({
disabled,
@@ -95,16 +96,36 @@ const ObjectTableNavigationButtons = ({
)}
- }
- onClick={handlePrevious}
- disabled={disabled || loading || !neighbors.previous?._id}
- />
- }
- onClick={handleNext}
- disabled={disabled || loading || !neighbors.next?._id}
- />
+ {
+ if (!disabled && !loading && neighbors.previous?._id) {
+ handlePrevious()
+ }
+ }, [disabled, loading, neighbors.previous?._id])}
+ >
+ }
+ onClick={handlePrevious}
+ disabled={disabled || loading || !neighbors.previous?._id}
+ />
+
+ {
+ if (!disabled && !loading && neighbors.next?._id) {
+ handleNext()
+ }
+ }, [disabled, loading, neighbors.next?._id])}
+ >
+ }
+ onClick={handleNext}
+ disabled={disabled || loading || !neighbors.next?._id}
+ />
+
)