diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index fa6faad7..134b6e9a 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1664,11 +1664,10 @@ void MainWindow::on_action_Save_triggered() {
 void MainWindow::on_mapViewTab_tabBarClicked(int index)
 {
     int oldIndex = ui->mapViewTab->currentIndex();
+    ui->mapViewTab->setCurrentIndex(index);
     if (index != oldIndex)
         Scripting::cb_MapViewTabChanged(oldIndex, index);
 
-    ui->mapViewTab->setCurrentIndex(index);
-
     if (index == 0) {
         editor->setEditingMap();
     } else if (index == 1) {
@@ -1685,11 +1684,10 @@ void MainWindow::on_action_Exit_triggered()
 void MainWindow::on_mainTabBar_tabBarClicked(int index)
 {
     int oldIndex = ui->mainTabBar->currentIndex();
+    ui->mainTabBar->setCurrentIndex(index);
     if (index != oldIndex)
         Scripting::cb_MainTabChanged(oldIndex, index);
 
-    ui->mainTabBar->setCurrentIndex(index);
-
     int tabIndexToStackIndex[5] = {0, 0, 1, 2, 3};
     ui->mainStackedWidget->setCurrentIndex(tabIndexToStackIndex[index]);