diff --git a/src/js/config.js b/src/js/config.js
index 00ca717..f76fa88 100644
--- a/src/js/config.js
+++ b/src/js/config.js
@@ -39,8 +39,8 @@ const URLState = {
             if (parts[1] === 'new') {
                 return { view: 'datasets', snippetId: null, datasetId: 'new' };
             }
-            // #datasets/dataset-123456
-            if (parts[1].startsWith('dataset-')) {
+            // #datasets/edit-dataset-123456 or #datasets/dataset-123456
+            if (parts[1].startsWith('edit-') || parts[1].startsWith('dataset-')) {
                 return { view: 'datasets', snippetId: null, datasetId: parts[1] };
             }
         }
@@ -246,6 +246,12 @@ const ModalManager = {
     },
 
     close(modalId) {
+        // Special handling for dataset modal to ensure URL state is updated
+        if (modalId === 'dataset-modal' && typeof closeDatasetManager === 'function') {
+            closeDatasetManager();
+            return;
+        }
+
         const modal = document.getElementById(modalId);
         if (modal) {
             modal.style.display = 'none';
diff --git a/src/js/dataset-manager.js b/src/js/dataset-manager.js
index e714a84..34919ac 100644
--- a/src/js/dataset-manager.js
+++ b/src/js/dataset-manager.js
@@ -509,18 +509,7 @@ function showURLPreviewPrompt(dataset) {
     previewBox.style.display = 'block';
     tableContainer.style.display = 'none';
 
-    const promptHTML = `
-        <div style="text-align: center; padding: 20px;">
-            <div style="margin-bottom: 12px; font-size: 11px; color: #606060;">
-                URL: ${dataset.data}<br/>
-                Format: ${dataset.format.toUpperCase()}
-            </div>
-            <button class="btn btn-standard primary" id="load-preview-btn">Load Preview</button>
-            <div style="margin-top: 8px; font-size: 10px; color: #808080; font-style: italic;">
-                Data will be fetched but not saved
-            </div>
-        </div>
-    `;
+    const promptHTML = `<div style="text-align: center;"><div style="margin-bottom: 8px; font-size: 11px; color: #606060;">URL: ${dataset.data}<br/>Format: ${dataset.format.toUpperCase()}</div><button class="btn btn-standard primary" id="load-preview-btn">Load Preview</button><div style="margin-top: 6px; font-size: 10px; color: #808080; font-style: italic;">Data will be fetched but not saved</div></div>`;
 
     previewBox.innerHTML = promptHTML;
 
@@ -877,6 +866,12 @@ function closeDatasetManager(updateURL = true) {
     modal.style.display = 'none';
     window.currentDatasetId = null;
 
+    // Hide dataset form if it's open (without updating URL to avoid double update)
+    const formView = document.getElementById('dataset-form-view');
+    if (formView && formView.style.display !== 'none') {
+        hideNewDatasetForm(false);
+    }
+
     // Update URL state - restore snippet if one is selected
     if (updateURL) {
         if (window.currentSnippetId) {
@@ -1336,13 +1331,18 @@ function checkSchemaChanges() {
 }
 
 // Hide new dataset form
-function hideNewDatasetForm() {
+function hideNewDatasetForm(updateURL = true) {
     document.getElementById('dataset-list-view').style.display = 'block';
     document.getElementById('dataset-form-view').style.display = 'none';
     window.datasetFormMode = null;
     window.editingDatasetId = null;
     window.originalSchema = null;
     hideSchemaWarning();
+
+    // Update URL to dataset list view
+    if (updateURL) {
+        URLState.update({ view: 'datasets', snippetId: null, datasetId: null });
+    }
 }
 
 // Save new dataset (handles both create and edit modes)
@@ -1444,6 +1444,11 @@ async function saveNewDataset() {
 
             Toast.success('Dataset updated successfully');
 
+            // Refresh visualization if a snippet is open
+            if (window.currentSnippetId && typeof renderVisualization === 'function') {
+                await renderVisualization();
+            }
+
             // Track event
             Analytics.track('dataset-update', `Update dataset (${source})`);
         } else {
@@ -1466,6 +1471,14 @@ async function saveNewDataset() {
 
             hideNewDatasetForm();
             await renderDatasetList();
+            await selectDataset(dataset.id);
+
+            Toast.success('Dataset created successfully');
+
+            // Refresh visualization if a snippet is open
+            if (window.currentSnippetId && typeof renderVisualization === 'function') {
+                await renderVisualization();
+            }
 
             // Track event
             Analytics.track('dataset-create', `Create dataset (${source})`);
@@ -1532,6 +1545,11 @@ async function refreshDatasetMetadata() {
         await selectDataset(dataset.id);
         await renderDatasetList();
 
+        // Refresh visualization if a snippet is open
+        if (window.currentSnippetId && typeof renderVisualization === 'function') {
+            await renderVisualization();
+        }
+
         // Brief success indicator
         refreshBtn.textContent = '✓';
         setTimeout(() => {
@@ -1839,6 +1857,11 @@ async function autoSaveDatasetMeta() {
     if (selectedItem) {
         selectedItem.classList.add('selected');
     }
+
+    // Refresh visualization if a snippet is open
+    if (window.currentSnippetId && typeof renderVisualization === 'function') {
+        await renderVisualization();
+    }
 }
 
 // Debounced auto-save for dataset metadata
diff --git a/src/js/snippet-manager.js b/src/js/snippet-manager.js
index 6641b56..dedcccc 100644
--- a/src/js/snippet-manager.js
+++ b/src/js/snippet-manager.js
@@ -852,7 +852,7 @@ function createSnippetFromDataset(datasetName) {
     const minimalSpec = {
         "$schema": "https://vega.github.io/schema/vega-lite/v5.json",
         "data": {"name": datasetName},
-        "mark": "point",
+        "mark": {"type": "point", "tooltip": true},
         "encoding": {}
     };