diff --git a/js/config.js b/js/config.js
index ee96bf4..5a8f094 100644
--- a/js/config.js
+++ b/js/config.js
@@ -23,6 +23,12 @@ let configPath;
 let configWindow;
 let saveCallback;
 
+function sendConfig() {
+    if (configWindow && !configWindow.isDestroyed()) {
+        configWindow.webContents.send('update-config', exports.data);
+    }
+}
+
 // -----------------------------------------------------------------------------
 // Public fields
 // -----------------------------------------------------------------------------
@@ -134,7 +140,6 @@ exports.showWindow = (parent, callback) => {
 
     // create lazily
     if (configWindow == undefined) {
-        console.log("create windows");
         saveCallback = callback;
 
         configWindow = new BrowserWindow({
@@ -156,6 +161,9 @@ exports.showWindow = (parent, callback) => {
             event.preventDefault();
             configWindow.hide();
         });
+        
+        // update text field values
+        configWindow.webContents.on('did-finish-load', sendConfig);
 
         ipcMain.on('save-config', (event, configData) => {
             configWindow.hide();
@@ -167,11 +175,11 @@ exports.showWindow = (parent, callback) => {
         });
 
         configWindow.loadFile('./html/config.html');
+    } else {
+        // update text field values
+        sendConfig();
     }
 
-    // update text field values
-    configWindow.webContents.send('update-config', this.data);
-
     // show window
     configWindow.show();
 }
\ No newline at end of file