diff --git a/plotjuggler_app/changelog_dialog.ui b/plotjuggler_app/changelog_dialog.ui
index 03a1c6a7f..6f396cd8f 100644
--- a/plotjuggler_app/changelog_dialog.ui
+++ b/plotjuggler_app/changelog_dialog.ui
@@ -23,7 +23,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>PlotJuggler</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
diff --git a/plotjuggler_app/main.cpp b/plotjuggler_app/main.cpp
index bdce31001..f816fe5ad 100644
--- a/plotjuggler_app/main.cpp
+++ b/plotjuggler_app/main.cpp
@@ -384,7 +384,7 @@ int main(int argc, char* argv[])
 
   manager.get(request);
 
-  MainWindow* w = nullptr;
+  MainWindow* window = nullptr;
 
   /*
    * You, fearless code reviewer, decided to start a journey into my source code.
@@ -441,7 +441,7 @@ int main(int argc, char* argv[])
         app.processEvents();
     }
 
-    w = new MainWindow(parser);
+    window = new MainWindow(parser);
 
     deadline = QDateTime::currentDateTime().addMSecs(3000);
     while (QDateTime::currentDateTime() < deadline && !splash.isHidden())
@@ -449,16 +449,17 @@ int main(int argc, char* argv[])
       app.processEvents();
     }
   }
-  else
+
+  if(!window)
   {
-    w = new MainWindow(parser);
+    window = new MainWindow(parser);
   }
 
-  w->show();
+  window->show();
 
   if (parser.isSet(start_streamer))
   {
-    w->on_buttonStreamingStart_clicked();
+    window->on_buttonStreamingStart_clicked();
   }
 
   return app.exec();