diff --git a/src/scripting/CMakeLists.txt b/src/scripting/CMakeLists.txt
--- a/src/scripting/CMakeLists.txt
+++ b/src/scripting/CMakeLists.txt
@@ -1,11 +1,13 @@
 set(scripting_SRCS
+    script.cpp
     scripthandler.cpp
+    scriptmanager.cpp
     taskaction.cpp
 )
 
 add_library(scripting STATIC ${scripting_SRCS})
 target_link_libraries(scripting
-    Qt5::Core
     Qt5::Qml
+    Qt5::Widgets
 )
 
diff --git a/src/scripting/script.h b/src/scripting/script.h
new file mode 100644
--- /dev/null
+++ b/src/scripting/script.h
@@ -0,0 +1,58 @@
+#ifndef SCRIPT_H
+/* This file is part of Zanshin
+
+   Copyright 2017 Cedric Bonhomme <bonhomme@mailoo.org>
+   Copyright 2017 Yann Cetois <yanncetois@hotmail.fr>
+
+   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 2 of
+   the License or (at your option) version 3 or any later version
+   accepted by the membership of KDE e.V. (or its successor approved
+   by the membership of KDE e.V.), which shall act as a proxy
+   defined in Section 14 of version 3 of the license.
+
+   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, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.
+*/
+
+
+#define SCRIPT_H
+
+#include <QObject>
+#include <QSharedPointer>
+#include "scriptmanager.h"
+
+class Script : public QObject
+{
+    Q_OBJECT
+public:
+    typedef QSharedPointer<Script> Ptr;
+
+    explicit Script(QObject *parent = Q_NULLPTR);
+    virtual ~Script();
+
+    bool enabled() const;
+    void setEnabled(bool enabled);
+
+    QString filename() const;
+    void setFilename(const QString &filename);
+
+signals:
+
+public slots:
+private:
+    bool m_enabled;
+    QString m_filename;
+};
+
+Q_DECLARE_METATYPE(Script::Ptr)
+
+#endif // SCRIPT_H
diff --git a/src/scripting/script.cpp b/src/scripting/script.cpp
new file mode 100644
--- /dev/null
+++ b/src/scripting/script.cpp
@@ -0,0 +1,55 @@
+/* This file is part of Zanshin
+
+   Copyright 2017 Cedric Bonhomme <bonhomme@mailoo.org>
+   Copyright 2017 Yann Cetois <yanncetois@hotmail.fr>
+
+   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 2 of
+   the License or (at your option) version 3 or any later version
+   accepted by the membership of KDE e.V. (or its successor approved
+   by the membership of KDE e.V.), which shall act as a proxy
+   defined in Section 14 of version 3 of the license.
+
+   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, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.
+*/
+
+
+#include "script.h"
+
+Script::Script(QObject *parent) : QObject(parent),
+    m_enabled(true)
+{
+}
+
+Script::~Script()
+{
+}
+
+bool Script::enabled() const
+{
+    return m_enabled;
+}
+
+void Script::setEnabled(bool enabled)
+{
+    m_enabled = enabled;
+}
+
+QString Script::filename() const
+{
+    return m_filename;
+}
+
+void Script::setFilename(const QString &filename)
+{
+    m_filename = filename;
+}
diff --git a/src/scripting/scripthandler.h b/src/scripting/scripthandler.h
--- a/src/scripting/scripthandler.h
+++ b/src/scripting/scripthandler.h
@@ -26,30 +26,33 @@
 #define SCRIPTING_SCRIPTHANDLER_H
 
 #include <QObject>
+#include <QPointer>
 #include <QJSValue>
 
+#include <QPushButton>
+
 #include "domain/taskrepository.h"
+#include "script.h"
 
-namespace Scripting
-{
+class Script;
 
 class ScriptHandler : public QObject
 {
     Q_OBJECT
 public:
-    explicit ScriptHandler(const Domain::TaskRepository::Ptr &taskRepository, QObject *parent = Q_NULLPTR);
+    explicit ScriptHandler(QObject *parent = Q_NULLPTR);
 
+    QJSValue evaluateScript(QSharedPointer<Script> &script);
     QJSValue evaluateFile(const QString &filename);
     QJSValue evaluateString(const QString &string);
 
-    QJSEngine *engine();
+    QPointer<QJSEngine> engine();
 
 private:
     Domain::TaskRepository::Ptr m_taskRepository;
 
-    QJSEngine *m_engine;
+    QPointer<QJSEngine> m_engine;
+    QPointer<QPushButton> m_button;
 };
 
-}
-
 #endif // SCRIPTING_SCRIPTHANDLER_H
diff --git a/src/scripting/scripthandler.cpp b/src/scripting/scripthandler.cpp
--- a/src/scripting/scripthandler.cpp
+++ b/src/scripting/scripthandler.cpp
@@ -27,26 +27,34 @@
 
 #include <QFile>
 #include <QJSEngine>
+#include <QTextStream>
 
-using namespace Scripting;
+#include <QDebug>
 
-ScriptHandler::ScriptHandler(const Domain::TaskRepository::Ptr &taskRepository, QObject *parent)
-    : QObject(parent),
-      m_taskRepository(taskRepository),
-      m_engine(new QJSEngine(this))
+ScriptHandler::ScriptHandler(QObject *parent)
+    : QObject (parent),
+    m_engine(new QJSEngine(this))
 {
-    m_engine->globalObject().setProperty(QStringLiteral("task"),
-                                         m_engine->newQObject(new TaskAction(m_taskRepository, this)));
+    m_button = new QPushButton;
+
+    m_engine->globalObject().setProperty("button", m_engine->newQObject(m_button));
+}
+
+QJSValue ScriptHandler::evaluateScript(QSharedPointer<Script> &script)
+{
+   return this->evaluateFile(script->filename());
 }
 
 QJSValue ScriptHandler::evaluateFile(const QString &filename)
 {
-    QFile file(filename);
-    file.open(QIODevice::ReadOnly);
-    QByteArray filecontent = file.readAll();
-    file.close();
+    qDebug() << "evaluating file" << filename;
+    QFile scriptFile(filename);
+    scriptFile.open(QIODevice::ReadOnly);
+    QTextStream stream(&scriptFile);
+    QString contents = stream.readAll();
+    scriptFile.close();
 
-    return m_engine->evaluate(filecontent, filename);
+    return m_engine->evaluate(contents, filename);
 }
 
 QJSValue ScriptHandler::evaluateString(const QString &string)
@@ -54,7 +62,7 @@
     return m_engine->evaluate(string);
 }
 
-QJSEngine *ScriptHandler::engine()
+QPointer<QJSEngine> ScriptHandler::engine()
 {
     return m_engine;
 }
diff --git a/src/scripting/scriptmanager.h b/src/scripting/scriptmanager.h
new file mode 100644
--- /dev/null
+++ b/src/scripting/scriptmanager.h
@@ -0,0 +1,66 @@
+/* This file is part of Zanshin
+
+   Copyright 2017 Cedric Bonhomme <bonhomme@mailoo.org>
+   Copyright 2017 Yann Cetois <yanncetois@hotmail.fr>
+
+   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 2 of
+   the License or (at your option) version 3 or any later version
+   accepted by the membership of KDE e.V. (or its successor approved
+   by the membership of KDE e.V.), which shall act as a proxy
+   defined in Section 14 of version 3 of the license.
+
+   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, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.
+*/
+
+
+#ifndef SCRIPTMANAGER_H
+#define SCRIPTMANAGER_H
+
+#include <QObject>
+#include <QSharedPointer>
+#include "script.h"
+#include "scripthandler.h"
+
+class Script;
+class ScriptHandler;
+
+/*!
+ \brief Manage scripts, load new scripts enable/disable, get new scripts
+*/
+class ScriptManager : public QObject
+{
+    Q_OBJECT
+public:
+    explicit ScriptManager(QObject *parent = Q_NULLPTR);
+
+    QList<QSharedPointer<Script>> scripts() const;
+
+    void runScript(QSharedPointer<Script> script);
+    void runScriptIndex(int script_index);
+
+    void enableScript(QSharedPointer<Script> script);
+    void disableScript(QSharedPointer<Script> script);
+
+    void addScript(const QString &filename);
+    void removeScript(QSharedPointer<Script> &script);
+
+signals:
+    void scriptsChanged();
+
+public slots:
+
+private:
+    QList<QSharedPointer<Script>> m_scripts;
+    QSharedPointer<ScriptHandler> m_handler;
+};
+#endif // SCRIPTMANAGER_H
diff --git a/src/scripting/scriptmanager.cpp b/src/scripting/scriptmanager.cpp
new file mode 100644
--- /dev/null
+++ b/src/scripting/scriptmanager.cpp
@@ -0,0 +1,74 @@
+/* This file is part of Zanshin
+
+   Copyright 2017 Cedric Bonhomme <bonhomme@mailoo.org>
+   Copyright 2017 Yann Cetois <yanncetois@hotmail.fr>
+
+   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 2 of
+   the License or (at your option) version 3 or any later version
+   accepted by the membership of KDE e.V. (or its successor approved
+   by the membership of KDE e.V.), which shall act as a proxy
+   defined in Section 14 of version 3 of the license.
+
+   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, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.
+*/
+
+
+#include "scriptmanager.h"
+#include <QtDebug>
+
+ScriptManager::ScriptManager(QObject *parent) : QObject(parent),
+    m_handler(QSharedPointer<ScriptHandler>::create())
+{
+
+}
+
+QList<QSharedPointer<Script> > ScriptManager::scripts() const
+{
+    return m_scripts;
+}
+
+void ScriptManager::runScript(QSharedPointer<Script> script)
+{
+    m_handler->evaluateScript(script);
+}
+
+void ScriptManager::runScriptIndex(int script_index)
+{
+    if(script_index >= 0) {
+        ScriptManager::runScript(m_scripts[script_index]);
+    }
+}
+
+void ScriptManager::enableScript(QSharedPointer<Script> script)
+{
+    script->setEnabled(true);
+}
+
+void ScriptManager::disableScript(QSharedPointer<Script> script)
+{
+    script->setEnabled(false);
+}
+
+void ScriptManager::addScript(const QString &filename)
+{
+    auto script = QSharedPointer<Script>::create();
+    script->setFilename(filename);
+    m_scripts.append(script);
+    emit scriptsChanged();
+}
+
+void ScriptManager::removeScript(QSharedPointer<Script> &script)
+{
+    qDebug() << script->filename() << " has been removed from the list of scripts";
+    m_scripts.removeOne(script);
+}
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -16,6 +16,8 @@
     quickselectdialog.cpp
     quickselectdialoginterface.cpp
     scripteditor.cpp
+    scriptlistdelegate.cpp
+    scriptlistwidget.cpp
     taskapplicationcomponents.cpp
 )
 
@@ -23,6 +25,7 @@
     editorview.ui
     filterwidget.ui
     newprojectdialog.ui
+    scripteditor.ui
 )
 
 add_library(widgets STATIC ${widgets_SRCS})
@@ -31,5 +34,6 @@
     Qt5::Widgets
     presentation
     zanshinkdepimstatic
+    scripting
     KF5::WindowSystem
 )
diff --git a/src/widgets/availablepagesview.h b/src/widgets/availablepagesview.h
--- a/src/widgets/availablepagesview.h
+++ b/src/widgets/availablepagesview.h
@@ -32,6 +32,8 @@
 
 #include <functional>
 
+#include "scripteditor.h"
+#include "scripting/scripthandler.h"
 #include "domain/datasource.h"
 #include "messageboxinterface.h"
 
@@ -83,6 +85,7 @@
     void onGoPreviousTriggered();
     void onGoNextTriggered();
     void onGoToTriggered();
+    void onGoToScriptEditor();
     void onInitTimeout();
 
 private:
@@ -92,6 +95,7 @@
     QAction *m_removeAction;
     QHash<QString, QAction*> m_actions;
 
+    QPointer<ScriptEditor> m_scripteditor;
     QObject *m_model;
     QAbstractItemModel *m_sources;
     Domain::DataSource::Ptr m_defaultSource;
diff --git a/src/widgets/availablepagesview.cpp b/src/widgets/availablepagesview.cpp
--- a/src/widgets/availablepagesview.cpp
+++ b/src/widgets/availablepagesview.cpp
@@ -38,11 +38,14 @@
 #include "widgets/messagebox.h"
 #include "widgets/newprojectdialog.h"
 #include "widgets/quickselectdialog.h"
+#include "widgets/scripteditor.h"
 
 #include "domain/project.h"
 #include "domain/context.h"
 #include "domain/tag.h"
 
+#include "scripting/scripthandler.h"
+
 using namespace Widgets;
 using namespace Presentation;
 
@@ -130,13 +133,19 @@
     goToAction->setShortcut(Qt::Key_J);
     connect(goToAction, &QAction::triggered, this, &AvailablePagesView::onGoToTriggered);
 
+    auto goToScriptEditor = new QAction(this);
+    goToScriptEditor->setObjectName(QStringLiteral("goToScriptEditor"));
+    goToScriptEditor->setText(tr("Go to script editor"));
+    connect(goToScriptEditor, &QAction::triggered, this, &AvailablePagesView::onGoToScriptEditor);
+
     m_actions.insert(QStringLiteral("pages_project_add"), m_addProjectAction);
     m_actions.insert(QStringLiteral("pages_context_add"), m_addContextAction);
     m_actions.insert(QStringLiteral("pages_tag_add"), m_addTagAction);
     m_actions.insert(QStringLiteral("pages_remove"), m_removeAction);
     m_actions.insert(QStringLiteral("pages_go_previous"), goPreviousAction);
     m_actions.insert(QStringLiteral("pages_go_next"), goNextAction);
-    m_actions.insert(QStringLiteral("pages_go_to"), goToAction);
+    m_actions.insert(QStringLiteral("pages_go_to"), goToScriptEditor);
+    m_actions.insert(QStringLiteral("pages_script_editor"), goToScriptEditor);
 }
 
 QHash<QString, QAction *> AvailablePagesView::globalActions() const
@@ -342,6 +351,12 @@
     }
 }
 
+void AvailablePagesView::onGoToScriptEditor()
+{
+    m_scripteditor = new ScriptEditor();
+    m_scripteditor->open();
+}
+
 void AvailablePagesView::onInitTimeout()
 {
     if (m_pagesView->model()) {
diff --git a/src/widgets/scripteditor.h b/src/widgets/scripteditor.h
--- a/src/widgets/scripteditor.h
+++ b/src/widgets/scripteditor.h
@@ -22,36 +22,41 @@
 */
 
 
-#ifndef WIDGETS_SCRIPTEDITOR_H
-#define WIDGETS_SCRIPTEDITOR_H
+#ifndef SCRIPTEDITOR_H
+#define SCRIPTEDITOR_H
 
-#include <QMainWindow>
+#include <QDialog>
+#include <QSharedPointer>
 
-#include "presentation/metatypes.h"
+#include "scriptmanager.h"
 
-class ScriptHandler;
-class QTextEdit;
+class ScriptManager;
+
+class QListWidgetItem;
+
+namespace Ui {
+class ScriptEditor;
+}
 
 namespace Widgets {
 
-class ScriptEditor : public QMainWindow
+class ScriptEditor : public QDialog
 {
     Q_OBJECT
 public:
     explicit ScriptEditor(QWidget *parent = Q_NULLPTR);
-    virtual ~ScriptEditor();
+    ~ScriptEditor();
 
-    QObjectPtr scriptHandler() const;
+    QSharedPointer<ScriptManager> scriptManager() const;
+    void setScriptManager(const QSharedPointer<ScriptManager> &scriptManager);
 
-public slots:
-    void setScriptHandler(const QObjectPtr &scriptHandler);
+private slots:
+    void on_pushButton_importScript_clicked();
+    void on_runScriptItem_clicked(QListWidgetItem* item);
 
 private:
-    QObjectPtr m_scriptHandler;
-
-    QTextEdit *m_textEdit;
+    Ui::ScriptEditor *ui;
+    QSharedPointer<ScriptManager> m_scriptManager;
 };
-
 }
-
-#endif // WIDGETS_SCRIPTEDITOR_H
+#endif // SCRIPTEDITOR_H
diff --git a/src/widgets/scripteditor.cpp b/src/widgets/scripteditor.cpp
--- a/src/widgets/scripteditor.cpp
+++ b/src/widgets/scripteditor.cpp
@@ -22,36 +22,59 @@
 */
 
 
+#include "ui_scripteditor.h"
 #include "scripteditor.h"
+#include <QFileDialog>
 
-#include "scripting/scripthandler.h"
-
-#include <QTextEdit>
+#include <QtDebug>
+#include <QMessageBox>
 
 using namespace Widgets;
 
-ScriptEditor::ScriptEditor(QWidget *parent)
-    : QMainWindow(parent),
-      m_textEdit(new QTextEdit(this))
+ScriptEditor::ScriptEditor(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::ScriptEditor)
 {
-    setWindowTitle(tr("Script Editor - Zanshin"));
-    resize(600, 600);
-    setCentralWidget(m_textEdit);
+    ui->setupUi(this);
+    m_scriptManager = QSharedPointer<ScriptManager>::create();
+
+    connect(ui->listWidget_scripts, SIGNAL(runItemRequested(QListWidgetItem*)),
+            this, SLOT(on_runScriptItem_clicked(QListWidgetItem*)));
 }
 
 ScriptEditor::~ScriptEditor()
 {
+    delete ui;
 }
 
-QObjectPtr ScriptEditor::scriptHandler() const
+void Widgets::ScriptEditor::on_pushButton_importScript_clicked()
 {
-    return m_scriptHandler;
+    QString filename = QFileDialog::getOpenFileName(this, tr("Open File"), QDir::homePath(), tr("Scripts (*.js *.qs)"));
+    if (filename.size() > 0) {
+        m_scriptManager->addScript(filename);
+        ui->listWidget_scripts->addItem(new QListWidgetItem(filename));
+    }
 }
 
-void ScriptEditor::setScriptHandler(const QObjectPtr &scriptHandler)
+void ScriptEditor::on_runScriptItem_clicked(QListWidgetItem *item)
 {
-    if (m_scriptHandler == scriptHandler)
-        return;
+    int scriptIndex =  item->listWidget()->currentIndex().row();
+
+    QMessageBox::StandardButton confirm = QMessageBox::question(this, tr("Run script"),
+                                                                tr("Do you want to run '%1'?").arg(m_scriptManager->scripts()[scriptIndex]->filename()),
+                                                                QMessageBox::Yes | QMessageBox::No);
+
+    if (confirm == QMessageBox::Yes) {
+        m_scriptManager->runScriptIndex(scriptIndex);
+      }
+}
 
-    m_scriptHandler = scriptHandler;
+QSharedPointer<ScriptManager> ScriptEditor::scriptManager() const
+{
+    return m_scriptManager;
+}
+
+void ScriptEditor::setScriptManager(const QSharedPointer<ScriptManager> &scriptManager)
+{
+    m_scriptManager = scriptManager;
 }
diff --git a/src/widgets/scripteditor.ui b/src/widgets/scripteditor.ui
new file mode 100644
--- /dev/null
+++ b/src/widgets/scripteditor.ui
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ScriptEditor</class>
+ <widget class="QDialog" name="ScriptEditor">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:large; font-weight:600;&quot;&gt;Zanshin Scripts&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="ScriptListWidget" name="listWidget_scripts"/>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QPushButton" name="pushButton_importScript">
+       <property name="text">
+        <string>Import script</string>
+       </property>
+       <property name="icon">
+        <iconset theme="list-add"/>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Ok</set>
+       </property>
+       <property name="centerButtons">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ScriptListWidget</class>
+   <extends>QListWidget</extends>
+   <header>scriptlistwidget.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>ScriptEditor</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>ScriptEditor</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/src/widgets/scriptlistdelegate.h b/src/widgets/scriptlistdelegate.h
new file mode 100644
--- /dev/null
+++ b/src/widgets/scriptlistdelegate.h
@@ -0,0 +1,16 @@
+#ifndef SCRIPTLISTDELEGATE_H
+#define SCRIPTLISTDELEGATE_H
+
+#include <QStyledItemDelegate>
+
+class ScriptListDelegate : public QStyledItemDelegate
+{
+public:
+    explicit ScriptListDelegate(QObject *parent = 0);
+    void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
+
+private:
+   QPixmap m_removePixmap;
+};
+
+#endif // SCRIPTLISTDELEGATE_H
diff --git a/src/widgets/scriptlistdelegate.cpp b/src/widgets/scriptlistdelegate.cpp
new file mode 100644
--- /dev/null
+++ b/src/widgets/scriptlistdelegate.cpp
@@ -0,0 +1,35 @@
+#include "scriptlistdelegate.h"
+
+#include <QPainter>
+#include <QApplication>
+
+ScriptListDelegate::ScriptListDelegate(QObject *parent)
+    : QStyledItemDelegate (parent)
+{
+    m_removePixmap = QIcon::fromTheme(QStringLiteral("list-remove")).pixmap(16);
+}
+
+void ScriptListDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
+{
+    const int center = option.rect.height() / 2 + option.rect.top();
+    const int runButtonIconSize = 16;
+    const int runButtonIconYPos = center - (runButtonIconSize / 2);
+    QRect runButtonIconRect(option.rect.right() - runButtonIconSize, runButtonIconYPos, runButtonIconSize, runButtonIconSize);
+
+    QApplication::style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &option, painter, option.widget);
+
+    const QString title = index.data(Qt::DisplayRole).toString();
+    QRect titleRect(0,option.rect.top(), option.rect.right(), option.fontMetrics.height());
+    QApplication::style()->drawItemText(painter, titleRect, Qt::AlignLeft, option.palette, true, title,  QPalette::Text);
+
+
+    QStyleOptionButton runButton;
+    runButton.icon = QIcon::fromTheme(QStringLiteral("system-run"));
+    runButton.iconSize = QSize(runButtonIconSize, runButtonIconSize);
+    runButton.rect = runButtonIconRect;
+    runButton.text = "";
+    runButton.state = QStyle::State_Enabled;
+
+    QApplication::style()->drawControl( QStyle::CE_PushButtonLabel, &runButton, painter);
+
+}
diff --git a/src/widgets/scriptlistwidget.h b/src/widgets/scriptlistwidget.h
new file mode 100644
--- /dev/null
+++ b/src/widgets/scriptlistwidget.h
@@ -0,0 +1,27 @@
+#ifndef SCRIPTLISTWIDGET_H
+#define SCRIPTLISTWIDGET_H
+
+#include <QListWidget>
+
+class ScriptListDelegate;
+
+class ScriptListWidget : public QListWidget
+{
+    Q_OBJECT
+public:
+    explicit ScriptListWidget(QWidget* parent = 0);
+
+signals:
+    void runItemRequested(QListWidgetItem* item);
+
+public slots:
+
+private:
+    bool containsRunIcon(const QPoint &pos) const;
+
+    void mousePressEvent(QMouseEvent* event);
+
+    ScriptListDelegate* m_delegate;
+};
+
+#endif // SCRIPTLISTWIDGET_H
diff --git a/src/widgets/scriptlistwidget.cpp b/src/widgets/scriptlistwidget.cpp
new file mode 100644
--- /dev/null
+++ b/src/widgets/scriptlistwidget.cpp
@@ -0,0 +1,43 @@
+#include "scriptlistwidget.h"
+#include "scriptlistdelegate.h"
+
+#include <QMouseEvent>
+
+ScriptListWidget::ScriptListWidget(QWidget *parent)
+    : QListWidget (parent),
+      m_delegate(new ScriptListDelegate(this))
+{
+    setItemDelegate(m_delegate);
+    setUniformItemSizes(true);
+}
+
+bool ScriptListWidget::containsRunIcon(const QPoint &pos) const
+{
+    QListWidgetItem* item = itemAt(pos);
+    if (!item) {
+        return false;
+    }
+
+    const QRect rect = visualItemRect(item);
+    const int runIconPosition = rect.right() - 16;
+    const int center = rect.height() / 2 + rect.top();
+    const int runIconYPos = center - (16 / 2);
+
+    QRect runIconRect(runIconPosition, runIconYPos, 16, 16);
+
+    return runIconRect.contains(pos);
+}
+
+void ScriptListWidget::mousePressEvent(QMouseEvent *event)
+{
+    if(containsRunIcon(event->pos())) {
+        auto item = itemAt(event->pos());
+
+        setCurrentIndex(indexFromItem(item));
+
+        emit runItemRequested(item);
+        return;
+    }
+
+    QListWidget::mousePressEvent(event);
+}
diff --git a/tests/units/scripting/CMakeLists.txt b/tests/units/scripting/CMakeLists.txt
--- a/tests/units/scripting/CMakeLists.txt
+++ b/tests/units/scripting/CMakeLists.txt
@@ -1,5 +1,6 @@
 zanshin_auto_tests(
   scripthandlertest
+  scriptmanagertest
   taskactiontest
 )
 
diff --git a/tests/units/scripting/scripthandlertest.cpp b/tests/units/scripting/scripthandlertest.cpp
--- a/tests/units/scripting/scripthandlertest.cpp
+++ b/tests/units/scripting/scripthandlertest.cpp
@@ -35,11 +35,8 @@
 private slots:
     void shouldBindObjects()
     {
-        // GIVEN
-        Utils::MockObject<Domain::TaskRepository> taskRepositoryMock;
-
         // WHEN
-        auto scripthandler = new Scripting::ScriptHandler(taskRepositoryMock.getInstance(), this);
+        auto scripthandler = new ScriptHandler(this);
 
         // THEN
         QVERIFY(!scripthandler->engine()->globalObject().property(QStringLiteral("task")).isNull());
@@ -49,8 +46,7 @@
     void shouldEvaluateString()
     {
         // GIVEN
-        Utils::MockObject<Domain::TaskRepository> taskRepositoryMock;
-        auto scripthandler = new Scripting::ScriptHandler(taskRepositoryMock.getInstance(), this);
+        auto scripthandler = new ScriptHandler(this);
 
         auto expression = QStringLiteral("41+1");
 
@@ -65,8 +61,7 @@
     void shouldEvaluateFile()
     {
         // GIVEN
-        Utils::MockObject<Domain::TaskRepository> taskRepositoryMock;
-        auto scripthandler = new Scripting::ScriptHandler(taskRepositoryMock.getInstance(), this);
+        auto scripthandler = new ScriptHandler(this);
 
         auto expression = QStringLiteral("41+1");
 
diff --git a/tests/units/scripting/scriptmanagertest.cpp b/tests/units/scripting/scriptmanagertest.cpp
new file mode 100644
--- /dev/null
+++ b/tests/units/scripting/scriptmanagertest.cpp
@@ -0,0 +1,45 @@
+/* This file is part of Zanshin
+
+   Copyright 2017 Cedric Bonhomme <bonhomme@mailoo.org>
+   Copyright 2017 Yann Cetois <yanncetois@hotmail.fr>
+
+   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 2 of
+   the License or (at your option) version 3 or any later version
+   accepted by the membership of KDE e.V. (or its successor approved
+   by the membership of KDE e.V.), which shall act as a proxy
+   defined in Section 14 of version 3 of the license.
+
+   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, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.
+*/
+
+#include <testlib/qtest_zanshin.h>
+
+#include "scripting/scriptmanager.h"
+
+#include "utils/mockobject.h"
+
+class ScriptManagerTest : public QObject
+{
+    Q_OBJECT
+private slots:
+    void shouldAddScriptToList()
+    {
+        //GIVEN
+        //WHEN
+        //THEN
+    }
+};
+
+ZANSHIN_TEST_MAIN(ScriptManagerTest)
+
+#include "scriptmanagertest.moc"
diff --git a/tests/units/widgets/scripteditortest.cpp b/tests/units/widgets/scripteditortest.cpp
--- a/tests/units/widgets/scripteditortest.cpp
+++ b/tests/units/widgets/scripteditortest.cpp
@@ -30,26 +30,35 @@
 {
     Q_OBJECT
 private slots:
-    void shouldNotHaveScriptHandler()
+    void shouldNotHaveScriptManager()
     {
         // GIVEN
         Widgets::ScriptEditor scriptEditor;
 
         // THEN
-        QVERIFY(scriptEditor.scriptHandler().isNull());
+        QVERIFY(scriptEditor.scriptManager().isNull());
     }
 
     void shouldHaveScriptHandler()
     {
         // GIVEN
         Widgets::ScriptEditor scriptEditor;
-        auto scriptHandler = QObjectPtr::create();
+        auto scriptManager = QSharedPointer<ScriptManager>::create();
 
         // WHEN
-        scriptEditor.setScriptHandler(scriptHandler);
+        scriptEditor.setScriptManager(scriptManager);
 
         // THEN
-        QCOMPARE(scriptEditor.scriptHandler(), scriptHandler);
+        QCOMPARE(scriptEditor.scriptManager(), scriptManager);
+    }
+
+    void shouldNotLoadEmptyFile() {
+        // GIVEN
+        Widgets::ScriptEditor scriptEditor;
+        auto scriptManager = QSharedPointer<ScriptManager>::create();
+
+        scriptEditor.setScriptManager(scriptManager);
+
     }
 };