diff --git a/limereport/lrreportdesignwindow.cpp b/limereport/lrreportdesignwindow.cpp
index d863ee9..57af790 100644
--- a/limereport/lrreportdesignwindow.cpp
+++ b/limereport/lrreportdesignwindow.cpp
@@ -1126,6 +1126,7 @@ void ReportDesignWindow::slotSaveReport()
     QString filename = m_reportDesignWidget->reportFileName();
     m_lblReportName->setText(filename);
     if(!filename.isEmpty()) addRecentFile(filename);
+    setWindowTitle(m_reportDesignWidget->report()->reportName() + " - Lime Report Designer");
 }
 
 void ReportDesignWindow::slotSaveReportAs()
@@ -1137,6 +1138,7 @@ void ReportDesignWindow::slotSaveReportAs()
         m_reportDesignWidget->saveToFile(fileName);
         m_lblReportName->setText(m_reportDesignWidget->reportFileName());
         addRecentFile(fileName);
+        setWindowTitle(m_reportDesignWidget->report()->reportName() + " - Lime Report Designer");
     }
 }
 
diff --git a/limereport/lrreportengine.cpp b/limereport/lrreportengine.cpp
index c28f921..4ebc0c9 100644
--- a/limereport/lrreportengine.cpp
+++ b/limereport/lrreportengine.cpp
@@ -876,6 +876,7 @@ bool ReportEnginePrivate::saveToFile(const QString &fileName)
         }
     }
     dropChanges();
+    this->setReportName(fi.baseName());
     return saved;
 }