diff --git a/src/frontend/src/tables/general/ParametricDataTable.tsx b/src/frontend/src/tables/general/ParametricDataTable.tsx
index eb1a675a8a..5434c633ff 100644
--- a/src/frontend/src/tables/general/ParametricDataTable.tsx
+++ b/src/frontend/src/tables/general/ParametricDataTable.tsx
@@ -40,6 +40,7 @@ import {
   useEditApiFormModal
 } from '../../hooks/UseForm';
 import { openGlobalPreview } from '../../states/PreviewDrawerState';
+import { useUserSettingsState } from '../../states/SettingsStates';
 import { useUserState } from '../../states/UserState';
 import {
   PARAMETER_FILTER_OPERATORS,
@@ -170,6 +171,12 @@ export default function ParametricDataTable({
   const user = useUserState();
   const navigate = useNavigate();
 
+  const userSettings = useUserSettingsState();
+
+  const showPreviewPanel = useMemo(() => {
+    return userSettings.isSet('ENABLE_PREVIEW_PANEL');
+  }, [userSettings]);
+
   useEffect(() => {
     if (refreshRef) {
       refreshRef.current = table.refreshTable;
@@ -502,7 +509,7 @@ export default function ParametricDataTable({
               onParameterClick(col.extra.template, record);
             } else if (record?.pk) {
               const url = getDetailUrl(modelType, record.pk);
-              if (eventModified(event as any)) {
+              if (!showPreviewPanel || eventModified(event as any)) {
                 navigateToLink(url, navigate, event);
               } else {
                 openGlobalPreview(modelType, record.pk);