diff --git a/frontend/index.html b/frontend/index.html
index b17f809..4163265 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -174,7 +174,10 @@
                         <div id="create-progress-bar" style="width: 0%; height: 100%; background: #28a745; transition: width 0.3s;"></div>
                     </div>
                 </div>
-                <button type="submit" class="submit-btn">Save Scene</button>
+                <div class="modal-footer" style="padding: 0; border: none; background: transparent;">
+                    <button type="button" class="cancel-btn" onclick="closeModal()">Hủy bỏ</button>
+                    <button type="submit" class="save-btn" style="padding: 12px 24px; font-weight: bold;">Save Scene</button>
+                </div>
             </form>
         </div>
     </div>
diff --git a/frontend/js/main_map.js b/frontend/js/main_map.js
index b5c2993..edb7e8e 100644
--- a/frontend/js/main_map.js
+++ b/frontend/js/main_map.js
@@ -408,6 +408,7 @@ function handleLogout() {
  * Opens Modal for creating a Scene and sets lat/lng inputs
  */
 function openCreateSceneModal(lat, lng) {
+    returnToDashboardAfterEdit = false;
     const token = localStorage.getItem('jwt');
     if (!token) {
         alert('Please log in first to create a 3D scene.');
@@ -439,6 +440,12 @@ function closeModal() {
     }
     document.getElementById('create-scene-form').reset();
     document.getElementById('shared-with-group').style.display = 'none';
+
+    if (returnToDashboardAfterEdit) {
+        returnToDashboardAfterEdit = false;
+        openDashboard();
+        openDashboardTab('media-library');
+    }
 }
 
 /**
@@ -662,6 +669,7 @@ async function handleEditDeleteScene(scene) {
 
     // Gán sự kiện cho nút Sửa
     editBtn.onclick = () => {
+        returnToDashboardAfterEdit = false;
         closeActionModal();
         openEditSceneModal(scene);
     };
@@ -1203,7 +1211,10 @@ async function loadMyScenes() {
             `;
             listContainer.appendChild(item);
             // Gán sự kiện sửa bằng code để truyền object scene an toàn
-            document.getElementById(`edit-${scene._id}`).onclick = () => openEditSceneModal(scene);
+            document.getElementById(`edit-${scene._id}`).onclick = () => {
+                returnToDashboardAfterEdit = false;
+                openEditSceneModal(scene);
+            };
         });
     } catch (e) {
         listContainer.innerHTML = `<p style="color:#ff4d4d">Lỗi: ${e.message}</p>`;