diff --git a/app/scanner2/mainwindow.cpp b/app/scanner2/mainwindow.cpp
index c36b1305..63708501 100644
--- a/app/scanner2/mainwindow.cpp
+++ b/app/scanner2/mainwindow.cpp
@@ -2323,8 +2323,13 @@ void MainWindow::on_act_save_triggered()
     {
         QString savePath;
         bool isOcr =false;
-        savePath = auto_save_info_.path;
-        isOcr = auto_save_info_.isOcr;
+        if (!auto_save_changes_)
+        {
+            savePath = auto_save_info_.path;
+            isOcr = auto_save_info_.isOcr;
+        }
+        else
+            savePath = m_currFilePath;
 
         int jpegQuality = auto_save_info_.jpegQuality;
         int tiffCompressionBW = auto_save_info_.tiffCompressionBW;
@@ -2333,7 +2338,7 @@ void MainWindow::on_act_save_triggered()
         bool find = false;
         int count = 0;
 
-        if(auto_save_info_.path.isEmpty())
+        if(!auto_save_changes_ || auto_save_info_.path.isEmpty())
         {
             Dialog_SaveAs dlg(false, this);
             if(savePath.length())
@@ -2343,20 +2348,27 @@ void MainWindow::on_act_save_triggered()
                     dlg.set_current_directory(savePath.left(pos));
             }
 
-            if (!dlg.exec())
+            if (!auto_save_changes_)
             {
-                return;
+                if (!dlg.exec())
+                {
+                    return;
+                }
             }
+            else
+                savePath = m_currFilePath;
 
-            savePath = auto_save_info_.path = dlg.getSavePath();
-            isOcr = auto_save_info_.isOcr = dlg.isOcr();
+            if (!auto_save_changes_)
+            {
+                savePath = auto_save_info_.path = dlg.getSavePath();
+                isOcr = auto_save_info_.isOcr = dlg.isOcr();
+            }
 
             jpegQuality = auto_save_info_.jpegQuality = dlg.getJpegQuality();
             tiffQuality = auto_save_info_.tiffQuality = dlg.getTiffQuality();
             tiffCompression = auto_save_info_.tiffCompression = dlg.getTiffCompression();
             tiffCompressionBW = auto_save_info_.tiffCompressionBW = dlg.getTiffCompressionBW();
         }
-
         if(auto_save_changes_ && save_from_changed_)
         {
             // appendix ...