diff --git a/client/src/mvc/dataset/dataset-li-edit.js b/client/src/mvc/dataset/dataset-li-edit.js
index fc02385a3c6..a4d9a7907d8 100644
--- a/client/src/mvc/dataset/dataset-li-edit.js
+++ b/client/src/mvc/dataset/dataset-li-edit.js
@@ -66,8 +66,9 @@ var DatasetListItemEdit = _super.extend(
                     const Galaxy = getGalaxyInstance();
                     if (Galaxy.router) {
                         ev.preventDefault();
+                        const identifier = self.model.get("element_id") || self.model.get("id");
                         Galaxy.router.push("datasets/edit", {
-                            dataset_id: self.model.attributes.id,
+                            dataset_id: identifier,
                         });
                     }
                 },
diff --git a/client/src/mvc/dataset/dataset-li.js b/client/src/mvc/dataset/dataset-li.js
index 69a0eabd9e3..2dff8798378 100644
--- a/client/src/mvc/dataset/dataset-li.js
+++ b/client/src/mvc/dataset/dataset-li.js
@@ -184,7 +184,8 @@ export var DatasetListItemView = _super.extend(
                     const Galaxy = getGalaxyInstance();
                     if (Galaxy.frame && Galaxy.frame.active) {
                         // Add dataset to frames.
-                        Galaxy.frame.addDataset(self.model.get("id"));
+                        const identifier = self.model.get("element_id") || self.model.get("id");
+                        Galaxy.frame.addDataset(identifier);
                         ev.preventDefault();
                     }
                 };