diff --git a/src/ui/CommConfigurationWindow.cc b/src/ui/CommConfigurationWindow.cc
index 099c28f46453d6bad16149269f71a62d97ec0dc3..223abd9186c70b9a2c022c627b4a55208243d3cd 100644
--- a/src/ui/CommConfigurationWindow.cc
+++ b/src/ui/CommConfigurationWindow.cc
@@ -55,7 +55,7 @@ This file is part of the QGROUNDCONTROL project
 #include "LinkManager.h"
 #include "MainWindow.h"
 
-CommConfigurationWindow::CommConfigurationWindow(LinkInterface* link, ProtocolInterface* protocol, QWidget *parent) : QWidget(parent)
+CommConfigurationWindow::CommConfigurationWindow(LinkInterface* link, ProtocolInterface* protocol, QWidget *parent) : QDialog(parent)
 {
     this->link = link;
 
diff --git a/src/ui/CommConfigurationWindow.h b/src/ui/CommConfigurationWindow.h
index 4333e5ad622c3864f976bd3c0f524e6246660370..65912b03b22d7edaf8b669373bca61cf4bb62e4e 100644
--- a/src/ui/CommConfigurationWindow.h
+++ b/src/ui/CommConfigurationWindow.h
@@ -33,7 +33,7 @@ This file is part of the QGROUNDCONTROL project
 #define _COMMCONFIGURATIONWINDOW_H_
 
 #include <QObject>
-#include <QWidget>
+#include <QDialog>
 #include <QAction>
 #include "LinkInterface.h"
 #include "ProtocolInterface.h"
@@ -62,7 +62,7 @@ enum qgc_protocol_t {
 /**
  * @brief Configuration window for communication links
  */
-class CommConfigurationWindow : public QWidget
+class CommConfigurationWindow : public QDialog
 {
     Q_OBJECT
 
diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index 354c73b4b1d9bd2931bb3b0fb1554d73bfeccdf4..2a5450c73f88057913358ce2228b82866b3129b6 100644
--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -1683,7 +1683,7 @@ void MainWindow::addLink(LinkInterface *link)
 
     if (!found)
     {
-        CommConfigurationWindow* commWidget = new CommConfigurationWindow(link, mavlink, NULL);
+        CommConfigurationWindow* commWidget = new CommConfigurationWindow(link, mavlink, this);
         commsWidgetList.append(commWidget);
         connect(commWidget,SIGNAL(destroyed(QObject*)),this,SLOT(commsWidgetDestroyed(QObject*)));
         QAction* action = commWidget->getAction();