diff --git a/python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConfigurable.java b/python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConfigurable.java
index 2861a3687f86..a6a5d1ec3150 100644
--- a/python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConfigurable.java
+++ b/python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConfigurable.java
@@ -49,12 +49,15 @@ public class IpnbConfigurable implements SearchableConfigurable {
     
     final FileChooserDescriptor fileChooserDescriptor = FileChooserDescriptorFactory.createSingleFolderDescriptor();
     myNotebookDirectoryField.addBrowseFolderListener("Select Working Directory", null, myProject, fileChooserDescriptor);
-    
-    myUrlField.setText(IpnbSettings.getInstance(myProject).getURL());
+
+    IpnbSettings ipnbSettings = IpnbSettings.getInstance(myProject);
+    myUrlField.setText(ipnbSettings.getURL());
     myUrlField.addFocusListener(createUrlProtocolValidationListener());
 
-    final String workingDirectory = IpnbSettings.getInstance(myProject).getWorkingDirectory();
-    myNotebookDirectoryField.setText(workingDirectory.isEmpty() ? myProject.getBasePath() : workingDirectory);
+    if (ipnbSettings.getWorkingDirectory().isEmpty()) {
+      ipnbSettings.setWorkingDirectory(myProject.getBasePath());
+    }
+    myNotebookDirectoryField.setText(ipnbSettings.getWorkingDirectory());
   }
 
   @NotNull