diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 4d1123f..29d61d8 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1,152 +1,158 @@
 /* Atelier KDE Printer Host for 3D Printing
     Copyright (C) <2016>
     Author: Lays Rodrigues - laysrodrigues@gmail.com
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include <QFileDialog>
 #include <KLocalizedString>
 #include <KStandardAction>
 #include <KActionCollection>
+#include <KXMLGUIFactory>
 
 MainWindow::MainWindow(QWidget *parent) :
     KXmlGuiWindow(parent),
     ui(new Ui::MainWindow),
     generalSettingsDialog(new GeneralSettingsDialog(this)),
     connectSettingsDialog(new ConnectSettingsDialog(firmwaresList, this))
 {
     ui->setupUi(this);
     setupActions();
     initConnectsToAtCore();
     initLocalVariables();
     connect(connectSettingsDialog, &ConnectSettingsDialog::_connect, &core, &AtCore::initSerial);
     initWidgets();
 }
 
 MainWindow::~MainWindow()
 {
     delete ui;
 }
 
 void MainWindow::initConnectsToAtCore()
 {
     connect(&core, &AtCore::stateChanged, this, &MainWindow::handlePrinterStatusChanged);
     connect(this, &MainWindow::extruderCountChanged, ui->bedExtWidget, &BedExtruderWidget::setExtruderCount);
 }
 
 void MainWindow::initLocalVariables()
 {
     firmwaresList = core.availablePlugins();
 }
 
 void MainWindow::initWidgets()
 {
     ui->bedExtWidget->setEnabled(false);
     ui->gcodeEditorWidget->setVisible(false);
 }
 
 void MainWindow::setupActions()
 {
     //Toolbar Actions
     QAction *action;
     action = actionCollection()->addAction(QStringLiteral("open_gcode"));
     action->setIcon(QIcon::fromTheme("open"));
     action->setText(i18n("&Open GCode"));
     connect(action, &QAction::triggered, this, &MainWindow::openFile);
 
     action = actionCollection()->addAction(QStringLiteral("connect"));
     action->setText(i18n("&Connect"));
     connect(action, &QAction::triggered, this, &MainWindow::startConnection);
 
     action = actionCollection()->addAction(QStringLiteral("settings"));
     action->setText(i18n("&Settings"));
     connect(action, &QAction::triggered, this, &MainWindow::openSettingsDialog);
 
     action = actionCollection()->addAction(QStringLiteral("print"));
     action->setText(i18n("&Print"));
     connect(action, &QAction::triggered, this, &MainWindow::printFile);
 
     action = actionCollection()->addAction(QStringLiteral("pause"));
     action->setText(i18n("&Pause"));
     connect(action, &QAction::triggered, this, &MainWindow::pausePrint);
 
     action = actionCollection()->addAction(QStringLiteral("stop"));
     action->setText(i18n("&Stop"));
     connect(action, &QAction::triggered, this, &MainWindow::stopPrint);
 
     action = actionCollection()->addAction(QStringLiteral("edit_gcode"));
     action->setText(i18n("&Edit GCode"));
     connect(action, &QAction::triggered, this, [ = ] {
         ui->gcodeEditorWidget->setVisible(!ui->gcodeEditorWidget->isVisible());
+        if(ui->gcodeEditorWidget->isVisible()) {
+            guiFactory()->addClient(ui->gcodeEditorWidget->gcodeView());
+        } else {
+            guiFactory()->removeClient(ui->gcodeEditorWidget->gcodeView());
+        }
     });
 
     QAction *quit = KStandardAction::quit(qApp, SLOT(quit()), actionCollection());
 
     setupGUI(Default, "atelierui.rc");
 }
 
 void MainWindow::openFile()
 {
     QUrl fileNameFromDialog = QFileDialog::getOpenFileUrl(this, i18n("Open GCode"),
                               QDir::homePath(), i18n("GCode (*.gco *.gcode)"));
     if (!fileNameFromDialog.isEmpty()) {
         fileName = fileNameFromDialog;
         ui->gcodeEditorWidget->loadFile(fileName);
     }
 }
 
 void MainWindow::openSettingsDialog()
 {
     generalSettingsDialog->show();
 }
 
 void MainWindow::startConnection()
 {
     connectSettingsDialog->show();
 }
 
 void MainWindow::printFile()
 {
     if (!fileName.isEmpty() && (core.state() == PrinterState::IDLE)) {
         QString f = fileName.toLocalFile();
         core.print(f);
     }
 }
 
 void MainWindow::pausePrint()
 {
     core.pause(QString());
 }
 
 void MainWindow::stopPrint()
 {
     core.stop();
 }
 
 void MainWindow::handlePrinterStatusChanged(PrinterState newState)
 {
     switch (newState) {
     case PrinterState::IDLE: {
         ui->bedExtWidget->setEnabled(true);
         emit extruderCountChanged(core.extruderCount());
     }break;
     case PrinterState::DISCONNECTED: {
         ui->bedExtWidget->setEnabled(false);
     }break;
     default:
         return;
     }
 }