1 files changed, 3 insertions, 3 deletions
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.cpp b/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.cpp
index 44025e5..73575c4 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.cpp
@@ -299,7 +299,7 @@ void ViewWindow::initView()
     if (existingView)
     {
         dataModel->setDb(db);
-        dataModel->setQuery(originalCreateView->select->detokenize());
+        dataModel->setQuery(originalCreateView->equivalentSelectTokens().detokenize());
         dataModel->setDatabaseAndView(database, view);
         ui->dbCombo->setDisabled(true);
     }
@@ -619,7 +619,7 @@ void ViewWindow::tabChanged(int tabIdx)
                                                    "Do you want to commit the structure, or do you want to go back to the structure tab?"),
                                                 tr("Go back to structure tab"), tr("Commit modifications and browse data."));
 
-                ui->tabWidget->setCurrentIndex(0);
+                ui->tabWidget->setCurrentIndex(CFG_UI.General.DataTabAsFirstInViews.get() ? 1 : 0);
                 if (res == 1)
                     commitView(true);
 
@@ -627,7 +627,7 @@ void ViewWindow::tabChanged(int tabIdx)
             }
 
             if (!dataLoaded)
-                ui->dataView->refreshData();
+                ui->dataView->refreshData(false);
 
             return;
     }