diff --git a/pom.xml b/pom.xml
index 7db1d61..a153a83 100755
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>bi.know.kettle.neo4j.output</groupId>
   <artifactId>Neo4JOutput</artifactId>
-  <version>3.15.0-SNAPSHOT</version>
+  <version>3.15.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Neo4JOutput</name>
diff --git a/src/main/java/bi/know/kettle/neo4j/shared/NeoConnectionDialog.java b/src/main/java/bi/know/kettle/neo4j/shared/NeoConnectionDialog.java
index bd438c6..d9d309b 100644
--- a/src/main/java/bi/know/kettle/neo4j/shared/NeoConnectionDialog.java
+++ b/src/main/java/bi/know/kettle/neo4j/shared/NeoConnectionDialog.java
@@ -34,11 +34,12 @@
  * @see NeoConnection
  */
 
-public class NeoConnectionDialog extends Dialog {
+public class NeoConnectionDialog {
   private static Class<?> PKG = NeoConnectionDialog.class; // for i18n purposes, needed by Translator2!!
 
   private NeoConnection neoConnection;
 
+  private Shell parent;
   private Shell shell;
 
   // Connection properties
@@ -62,15 +63,15 @@ public class NeoConnectionDialog extends Dialog {
   private boolean ok;
   private Label wlPolicy;
 
-  public NeoConnectionDialog( Shell par, NeoConnection neoConnection ) {
-    super( par, SWT.NONE );
+  public NeoConnectionDialog( Shell parent, NeoConnection neoConnection ) {
+    this.parent = parent;
     this.neoConnection = neoConnection;
     props = PropsUI.getInstance();
     ok = false;
   }
 
   public boolean open() {
-    Shell parent = getParent();
+    Display display = parent.getDisplay();
     shell = new Shell( parent, SWT.DIALOG_TRIM | SWT.RESIZE | SWT.MAX | SWT.MIN );
     props.setLook( shell );
     shell.setImage( GUIResource.getInstance().getImageSlave() );
@@ -129,7 +130,7 @@ public void shellClosed( ShellEvent e ) {
     BaseStepDialog.setSize( shell );
 
     shell.open();
-    Display display = parent.getDisplay();
+
     while ( !shell.isDisposed() ) {
       if ( !display.readAndDispatch() ) {
         display.sleep();