diff --git a/src/gui/ProjectPanel.cpp b/src/gui/ProjectPanel.cpp
index ff0e3db29..cd94cc0f2 100644
--- a/src/gui/ProjectPanel.cpp
+++ b/src/gui/ProjectPanel.cpp
@@ -112,6 +112,8 @@ void ProjectPanel::initMain(FWWindow *main)
 
     fd  = new findDialog(this, this);
     fd->hide();
+
+    m_panel->icons->setUpSignals(this);
 }
 
 void ProjectPanel::reset()
@@ -160,8 +162,6 @@ ProjectPanel::ProjectPanel(QWidget *parent):
 
     connect(m_panel->topSplitter, SIGNAL(splitterMoved(int,int)),
             this, SLOT(splitterPositionChanged(int,int)));
-
-    m_panel->icons->setUpSignals(this);
 }
 
 ProjectPanel::~ProjectPanel()
diff --git a/src/gui/WorkflowIcons.cpp b/src/gui/WorkflowIcons.cpp
index 3351e753e..2e7918028 100644
--- a/src/gui/WorkflowIcons.cpp
+++ b/src/gui/WorkflowIcons.cpp
@@ -38,16 +38,6 @@ WorkflowIcons::WorkflowIcons(QWidget *parent) :
     ui(new Ui::WorkflowIcons_q)
 {
     ui->setupUi(this);
-
-}
-
-// Find main window object if child is in it's widget tree
-QObject *findMainWindow(QObject *child)
-{
-    if (dynamic_cast<FWWindow*>(child)!=NULL)
-        return child;
-    else
-        return findMainWindow(child->parent());
 }
 
 void WorkflowIcons::setUpSignals(QWidget *panel)
@@ -57,7 +47,7 @@ void WorkflowIcons::setUpSignals(QWidget *panel)
     connect(ui->newFirewall, SIGNAL(clicked()), newFirewall, SLOT(trigger()));
 
     // global variable mw is null when this is running
-    QObject *mainWindow = findMainWindow(panel);
+    QObject *mainWindow = dynamic_cast<ProjectPanel*>(panel)->getWindow();
     QAction *import = mainWindow->findChild<QAction*>("policyImportAction");
     connect(ui->importConfig, SIGNAL(clicked()), import, SLOT(trigger()));