diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5cb495d5..6e312dd9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -22,6 +22,7 @@ add_executable(dlt-viewer
     main.cpp
     mainwindow.h
     mainwindow.cpp
+    mainwindow.h
     project.h
     project.cpp
     ecudialog.h
@@ -82,6 +83,19 @@ add_executable(dlt-viewer
     resources/dlt_viewer.rc
     ecutree.h
     ecutree.cpp
+    mainwindow.ui
+    exporterdialog.ui
+    searchdialog.ui
+    searchform.ui
+    settingsdialog.ui
+    multiplecontextdialog.ui
+    plugindialog.ui
+    filterdialog.ui
+    injectiondialog.ui
+    jumptodialog.ui
+    ecudialog.ui
+    contextdialog.ui
+    applicationdialog.ui
     fileexplorertab.ui
     fileexplorertab.h
     fileexplorertab.cpp
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index d089dbe8..2bed6a54 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -2961,7 +2961,7 @@ void MainWindow::on_action_menuConfig_Context_Edit_triggered()
 void MainWindow::on_action_menuDLT_Edit_All_Log_Levels_triggered()
 {
 
-    MultipleContextDialog dlg(0,0);
+    MultipleContextDialog dlg(logLevel,traceStatus);
 
     if(dlg.exec())
     {
@@ -3018,6 +3018,9 @@ void MainWindow::on_action_menuDLT_Edit_All_Log_Levels_triggered()
                     conitem->loglevel = dlg.loglevel();
                     conitem->tracestatus = dlg.tracestatus();
 
+                    logLevel = conitem->loglevel + 1;
+                    traceStatus = conitem->tracestatus +1;
+
                     /* update context item */
                     conitem->update();
 
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 858d227c..21f503a8 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -235,6 +235,13 @@ class MainWindow : public QMainWindow
     QString target_version_string;
 
     QList<unsigned long int> selectedMarkerRows;
+    
+    /**/
+    SortFilterProxyModel *sortProxyModel;
+
+    //values to carry the logLevel and traceStatus : Edit All Log Levels
+    int logLevel = 0;
+    int traceStatus = 0;
 
     /* functions called in constructor */
     void initState();