diff --git a/src/lib/QtWidgets/QColorDialog.ts b/src/lib/QtWidgets/QColorDialog.ts
index bf7bb9ee1..fcd6941cc 100644
--- a/src/lib/QtWidgets/QColorDialog.ts
+++ b/src/lib/QtWidgets/QColorDialog.ts
@@ -1,7 +1,7 @@
 import addon from '../utils/addon';
 import { QWidget } from './QWidget';
 import { NativeElement } from '../core/Component';
-import { NodeDialog, QDialogSignals } from './QDialog';
+import { QDialog, QDialogSignals } from './QDialog';
 import { QColor } from '../QtGui/QColor';
 
 /**
@@ -26,7 +26,7 @@ console.log(color.red(), color.green(), color.blue());
 
 ```
  */
-export class QColorDialog extends NodeDialog<QColorDialogSignals> {
+export class QColorDialog extends QDialog<QColorDialogSignals> {
     constructor(parent?: QWidget) {
         let native: NativeElement;
         if (parent) {
diff --git a/src/lib/QtWidgets/QDialog.ts b/src/lib/QtWidgets/QDialog.ts
index 9ef4d2eaa..fdf692670 100644
--- a/src/lib/QtWidgets/QDialog.ts
+++ b/src/lib/QtWidgets/QDialog.ts
@@ -5,9 +5,30 @@ import { checkIfNativeElement } from '../utils/helpers';
 import { QWidget, QWidgetSignals } from './QWidget';
 import { DialogCode } from '../QtEnums';
 
-// All Dialogs should extend from NodeDialog
-// Implement all native QDialog methods here so that all dialogs get access to those aswell
-export abstract class NodeDialog<Signals extends QDialogSignals> extends QWidget<Signals> {
+/**
+
+> This is the base class of dialog windows.
+
+* **This class is a JS wrapper around Qt's [QDialog class](https://doc.qt.io/qt-5/qdialog.html)**
+
+It is inherited by QFileDialog and QMessageBox (n/a QColorDialog, QErrorMessage, QFontDialog, QInputDialog, QMessageBox, QProgressDialog, and QWizard)
+ */
+export class QDialog<Signals extends QDialogSignals = QDialogSignals> extends QWidget<Signals> {
+    constructor(arg?: QDialog | NativeElement) {
+        let native;
+        let parent;
+        if (checkIfNativeElement(arg)) {
+            native = arg as NativeElement;
+        } else if (arg as QDialog) {
+            parent = arg as QDialog;
+            native = new addon.QDialog(parent.native);
+        } else {
+            native = new addon.QDialog();
+        }
+        super(native);
+        this.setNodeParent(parent);
+    }
+
     setResult(i: number): void {
         this.native.setResult(i);
     }
@@ -34,31 +55,6 @@ export abstract class NodeDialog<Signals extends QDialogSignals> extends QWidget
     }
 }
 
-/**
-
-> This is the base class of dialog windows.
-
-* **This class is a JS wrapper around Qt's [QDialog class](https://doc.qt.io/qt-5/qdialog.html)**
-
-It is inherited by QFileDialog and QMessageBox (n/a QColorDialog, QErrorMessage, QFontDialog, QInputDialog, QMessageBox, QProgressDialog, and QWizard)
- */
-export class QDialog extends NodeDialog<QDialogSignals> {
-    constructor(arg?: NodeDialog<QDialogSignals> | NativeElement) {
-        let native;
-        let parent;
-        if (checkIfNativeElement(arg)) {
-            native = arg as NativeElement;
-        } else if (arg as NodeDialog<QDialogSignals>) {
-            parent = arg as NodeDialog<QDialogSignals>;
-            native = new addon.QDialog(parent.native);
-        } else {
-            native = new addon.QDialog();
-        }
-        super(native);
-        this.setNodeParent(parent);
-    }
-}
-
 export interface QDialogSignals extends QWidgetSignals {
     accepted: () => void;
     finished: (result: number) => void;
diff --git a/src/lib/QtWidgets/QErrorMessage.ts b/src/lib/QtWidgets/QErrorMessage.ts
index 1c2dcbe0e..431a503be 100644
--- a/src/lib/QtWidgets/QErrorMessage.ts
+++ b/src/lib/QtWidgets/QErrorMessage.ts
@@ -1,7 +1,7 @@
 import addon from '../utils/addon';
 import { QWidget } from './QWidget';
 import { NativeElement } from '../core/Component';
-import { NodeDialog, QDialogSignals } from './QDialog';
+import { QDialog, QDialogSignals } from './QDialog';
 
 /**
 
@@ -20,7 +20,7 @@ const errorMessage = new QErrorMessage();
 
 ```
  */
-export class QErrorMessage extends NodeDialog<QErrorMessageSignals> {
+export class QErrorMessage extends QDialog<QErrorMessageSignals> {
     constructor(parent?: QWidget) {
         let native: NativeElement;
         if (parent) {
diff --git a/src/lib/QtWidgets/QFileDialog.ts b/src/lib/QtWidgets/QFileDialog.ts
index cfc77dbf7..0d5243f41 100644
--- a/src/lib/QtWidgets/QFileDialog.ts
+++ b/src/lib/QtWidgets/QFileDialog.ts
@@ -2,7 +2,7 @@ import addon from '../utils/addon';
 import { QWidget } from './QWidget';
 import { NativeElement } from '../core/Component';
 import { AcceptMode, DialogLabel, FileMode, Option, ViewMode } from '../QtEnums';
-import { NodeDialog, QDialogSignals } from './QDialog';
+import { QDialog, QDialogSignals } from './QDialog';
 
 /**
 
@@ -27,7 +27,7 @@ console.log(selectedFiles);
 
 ```
  */
-export class QFileDialog extends NodeDialog<QFileDialogSignals> {
+export class QFileDialog extends QDialog<QFileDialogSignals> {
     constructor();
     constructor(parent: QWidget, caption?: string, directory?: string, filter?: string);
     constructor(parent?: QWidget, caption = 'Select File', directory = '', filter = '') {
diff --git a/src/lib/QtWidgets/QFontDialog.ts b/src/lib/QtWidgets/QFontDialog.ts
index 9bc642adf..f8c6bb308 100644
--- a/src/lib/QtWidgets/QFontDialog.ts
+++ b/src/lib/QtWidgets/QFontDialog.ts
@@ -1,7 +1,7 @@
 import addon from '../utils/addon';
 import { QWidget } from './QWidget';
 import { NativeElement } from '../core/Component';
-import { NodeDialog, QDialogSignals } from './QDialog';
+import { QDialog, QDialogSignals } from './QDialog';
 import { QFont } from '../QtGui/QFont';
 
 /**
@@ -24,7 +24,7 @@ console.log(font);
 
 ```
  */
-export class QFontDialog extends NodeDialog<QFontDialogSignals> {
+export class QFontDialog extends QDialog<QFontDialogSignals> {
     constructor(parent?: QWidget) {
         let native: NativeElement;
         if (parent) {
diff --git a/src/lib/QtWidgets/QInputDialog.ts b/src/lib/QtWidgets/QInputDialog.ts
index b40620df4..69cbfd3dc 100644
--- a/src/lib/QtWidgets/QInputDialog.ts
+++ b/src/lib/QtWidgets/QInputDialog.ts
@@ -1,6 +1,6 @@
 import addon from '../utils/addon';
 import { QWidget } from './QWidget';
-import { NodeDialog, QDialogSignals } from './QDialog';
+import { QDialog, QDialogSignals } from './QDialog';
 import { EchoMode } from './QLineEdit';
 
 /**
@@ -21,7 +21,7 @@ dialog.exec();
 
 ```
  */
-export class QInputDialog extends NodeDialog<QInputDialogSignals> {
+export class QInputDialog extends QDialog<QInputDialogSignals> {
     constructor(parent?: QWidget) {
         let native;
         if (parent) {
diff --git a/src/lib/QtWidgets/QMessageBox.ts b/src/lib/QtWidgets/QMessageBox.ts
index 7531842f4..7c08774e3 100644
--- a/src/lib/QtWidgets/QMessageBox.ts
+++ b/src/lib/QtWidgets/QMessageBox.ts
@@ -1,7 +1,7 @@
 import addon from '../utils/addon';
 import { QWidget } from './QWidget';
 import { NativeRawPointer } from '../core/Component';
-import { NodeDialog, QDialogSignals } from './QDialog';
+import { QDialog, QDialogSignals } from './QDialog';
 import { QAbstractButton, QAbstractButtonSignals } from './QAbstractButton';
 import { QPushButton } from './QPushButton';
 
@@ -39,7 +39,7 @@ messageBox.exec();
 
 ```
  */
-export class QMessageBox extends NodeDialog<QMessageBoxSignals> {
+export class QMessageBox extends QDialog<QMessageBoxSignals> {
     constructor(parent?: QWidget) {
         let native;
         if (parent) {
diff --git a/src/lib/QtWidgets/QProgressDialog.ts b/src/lib/QtWidgets/QProgressDialog.ts
index d21bc5274..031d82e70 100644
--- a/src/lib/QtWidgets/QProgressDialog.ts
+++ b/src/lib/QtWidgets/QProgressDialog.ts
@@ -1,6 +1,6 @@
 import addon from '../utils/addon';
 import { QWidget } from './QWidget';
-import { NodeDialog, QDialogSignals } from './QDialog';
+import { QDialog, QDialogSignals } from './QDialog';
 
 /**
 
@@ -19,7 +19,7 @@ const progressDialog = new QProgressDialog();
 
 ```
  */
-export class QProgressDialog extends NodeDialog<QProgressDialogSignals> {
+export class QProgressDialog extends QDialog<QProgressDialogSignals> {
     constructor(parent?: QWidget) {
         let native;
         if (parent) {