diff --git a/applets/CMakeLists.txt b/applets/CMakeLists.txt
index 50d8e64a..b01d98bf 100644
--- a/applets/CMakeLists.txt
+++ b/applets/CMakeLists.txt
@@ -1,2 +1,3 @@
 plasma_install_package(activities org.kde.phone.activities)
 plasma_install_package(clock org.kde.phone.clock)
+plasma_install_package(krunner org.kde.phone.krunner)
diff --git a/applets/krunner/Messages.sh b/applets/krunner/Messages.sh
new file mode 100755
index 00000000..b5588104
--- /dev/null
+++ b/applets/krunner/Messages.sh
@@ -0,0 +1,4 @@
+#! /usr/bin/env bash
+$EXTRACTRC `find . -name \*.rc -o -name \*.ui -o -name \*.kcfg` >> rc.cpp
+$XGETTEXT `find . -name \*.js -o -name \*.qml -o -name \*.cpp` -o $podir/plasma_applet_org.kde.phone.krunner.pot
+rm -f rc.cpp
diff --git a/applets/krunner/contents/ui/main.qml b/applets/krunner/contents/ui/main.qml
new file mode 100644
index 00000000..731579a2
--- /dev/null
+++ b/applets/krunner/contents/ui/main.qml
@@ -0,0 +1,72 @@
+/*
+ *   Copyright 2014 Aaron Seigo <aseigo@kde.org>
+ *   Copyright 2015 Marco Martin <notmart@gmail.com>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU Library General Public License as
+ *   published by the Free Software Foundation; either version 2, 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 Library General Public License for more details
+ *
+ *   You should have received a copy of the GNU Library 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.
+ */
+
+import QtQuick 2.1
+import QtQuick.Window 2.1
+import QtQuick.Controls 2.2 as Controls
+import QtQuick.Layouts 1.1
+import org.kde.plasma.plasmoid 2.0
+import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.components 3.0 as PlasmaComponents
+import org.kde.milou 0.1 as Milou
+import org.kde.kirigami 2.10 as Kirigami
+
+PlasmaComponents.TextField {
+    id: bigClock
+
+    PlasmaCore.ColorScope.colorGroup: PlasmaCore.Theme.NormalColorGroup
+    text: i18n("Search...")
+    Plasmoid.backgroundHints: PlasmaCore.Types.ShadowBackground | PlasmaCore.Types.ConfigurableBackground
+    MouseArea {
+        anchors.fill: parent
+        onClicked: window.showMaximized()
+    }
+    Kirigami.AbstractApplicationWindow {
+        id: window
+        visible: false
+        onVisibleChanged: {
+            if (visible) {
+                queryField.forceActiveFocus();
+            }
+        }
+        header: Controls.ToolBar {
+            contentItem: Kirigami.SearchField {
+                id: queryField
+                focus: true
+            }
+        }
+        Controls.ScrollView {
+            anchors.fill: parent
+            Milou.ResultsListView {
+                id: listView
+                queryString: queryField.text
+                highlight: null
+                PlasmaCore.ColorScope.colorGroup: PlasmaCore.Theme.NormalColorGroup
+                anchors.rightMargin: 10
+
+                onActivated: queryField.text = ""
+                onUpdateQueryString: {
+                    queryField.text = text
+                    queryField.cursorPosition = cursorPosition
+                }
+            }
+        }
+    }
+}
diff --git a/applets/krunner/metadata.desktop b/applets/krunner/metadata.desktop
new file mode 100644
index 00000000..a40d9205
--- /dev/null
+++ b/applets/krunner/metadata.desktop
@@ -0,0 +1,22 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Search And Run
+
+Comment=Search and run Applications and services
+
+Icon=preferences-system-time
+Type=Service
+X-KDE-ParentApp=
+X-KDE-PluginInfo-Author=Marco Martin
+X-KDE-PluginInfo-Email=mart@kde.org
+X-KDE-PluginInfo-License=GPL
+X-KDE-PluginInfo-Name=org.kde.phone.krunner
+X-KDE-PluginInfo-Version=1.0
+X-KDE-PluginInfo-Website=plasma.kde.org
+X-KDE-ServiceTypes=Plasma/Applet
+X-Plasma-API=declarativeappletscript
+X-KDE-PluginInfo-Category=Search
+X-Plasma-Provides=org.kde.plasma.search
+
+X-Plasma-MainScript=ui/main.qml
+X-Plasma-RemoteLocation=