2 files changed, 3 insertions, 1 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 030a323b..cb530e9b 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -140,6 +140,9 @@ static void updateSource_DocumentWidget_(iDocumentWidget *d) {
     deinit_String(&str);
     updateVisible_DocumentWidget_(d);
     refresh_Widget(as_Widget(d));
+    setTitle_Window(get_Window(),
+                    !isEmpty_String(title_GmDocument(d->doc)) ? title_GmDocument(d->doc)
+                                                              : collectNewCStr_String("Lagrange"));
 }
 
 static void fetch_DocumentWidget_(iDocumentWidget *d) {
diff --git a/src/ui/window.c b/src/ui/window.c
index 6196a638..a110c5ad 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -90,7 +90,6 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
     else if (equal_Command(cmd, "document.changed")) {
         iInputWidget *url = findWidget_App("url");
         setTextCStr_InputWidget(url, valuePtr_Command(cmd, "url"));
-        setTitle_Window(get_Window(), text_InputWidget(url));
         updateTextCStr_LabelWidget(findChild_Widget(navBar, "reload"), reloadCStr_);
         return iFalse;
     }