diff --git a/qt/Widgets/ImagesWidget/ImagesWidget.cpp b/qt/Widgets/ImagesWidget/ImagesWidget.cpp
index 9d7f8c8b4c7d5490a7a49e6378286edea79ca96d..fb31340f69011b7d4ad6e92b865d6407718422a7 100644
--- a/qt/Widgets/ImagesWidget/ImagesWidget.cpp
+++ b/qt/Widgets/ImagesWidget/ImagesWidget.cpp
@@ -164,6 +164,9 @@ Media ImagesWidget::getChosenImages() {
         if (!pushButton) {
             continue;
         }
+        if (!pushButton->isChecked()) {
+            continue;
+        }
         SourceWithAdditionalInfo image;
         bool isLocal = pushButton->property("isLocal").toBool();
         image.src = pushButton->property("src").toString().toStdString();
diff --git a/qt/Widgets/MainWindow/mainwindow.cpp b/qt/Widgets/MainWindow/mainwindow.cpp
index 3a0bcdad7458afcc1d7f202ab8e1b7c5c705adb7..45852630d562376e6fa50ca2dc50c6c2ba3d1ae1 100644
--- a/qt/Widgets/MainWindow/mainwindow.cpp
+++ b/qt/Widgets/MainWindow/mainwindow.cpp
@@ -18,11 +18,13 @@
 #include "WordPluginWrapper.h"
 #include "FormatProcessorPluginWrapper.h"
 #include "ServerConnection.h"
+#include <cstdlib>
 #include <filesystem>
 #include <memory>
 #include <QBoxLayout>
 #include <iostream>
 #include <iostream>
+#include <qcoreevent.h>
 
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
@@ -116,6 +118,7 @@ void MainWindow::updateTags(const Card *card)
     if (!card) {
         return;
     }
+    currentTags = card->tags;
     ui->tagsLine->setText(QString::fromStdString(parse_tags(card->tags)));
 }
 
@@ -170,11 +173,11 @@ void MainWindow::onPrevClicked()
 void MainWindow::onAddClicked() {
     Card card;
     card.word = ui->wordLine->text().toStdString();
-    // card.tags = ui->tagsLine->text().toStdString();
+    card.tags = currentTags;
     card.definition = ui->definitionEdit->toPlainText().toStdString();
-    card.examples = sentencesWidget->getSentences();
-    card.audios = audiosWidget->getAudios();
-    card.images = imagesWidget->getImages();
+    card.examples = sentencesWidget->getChosenSentences();
+    card.audios = audiosWidget->getChosenAudio();
+    card.images = imagesWidget->getChosenImages();
     savedDeck.push_back(card);
     onNextClicked();
 }
@@ -186,4 +189,5 @@ void MainWindow::save() {
     FormatProcessorPluginWrapper savingPlugin(connection);
     savingPlugin.init("processor");
     savingPlugin.save(absolute_path);
+    exit(0);
 }
diff --git a/qt/Widgets/MainWindow/mainwindow.h b/qt/Widgets/MainWindow/mainwindow.h
index 87b2194eec1e0fd207545e76f76967cafc45d320..bce9b5ef305326c81445b1f392c153e431ae4f24 100644
--- a/qt/Widgets/MainWindow/mainwindow.h
+++ b/qt/Widgets/MainWindow/mainwindow.h
@@ -2,6 +2,7 @@
 #define MAINWINDOW_H
 
 #include <QMainWindow>
+#include <nlohmann/json_fwd.hpp>
 #include "deck_model.h"
 #include "Card.h"
 #include "AudiosWidget.hpp"
@@ -46,5 +47,6 @@ private:
     AudiosWidget* audiosWidget;
     ImagesWidget* imagesWidget;
     QModelIndex current_index;
+    nlohmann::json currentTags;
 };
 #endif // MAINWINDOW_H
diff --git a/qt/Widgets/MainWindow/mainwindow.ui b/qt/Widgets/MainWindow/mainwindow.ui
index c33233ea62877ec41ca4ba0359ba8700f0d8f375..8c6b28721af9ea92f775973256bcc82092306777 100644
--- a/qt/Widgets/MainWindow/mainwindow.ui
+++ b/qt/Widgets/MainWindow/mainwindow.ui
@@ -56,7 +56,7 @@
       <item>
        <widget class="QPushButton" name="saveButton">
         <property name="text">
-         <string>Save</string>
+         <string>Save and quit</string>
         </property>
        </widget>
       </item>