diff --git a/kcms/workspaceoptions/mainpage.ui b/kcms/workspaceoptions/mainpage.ui
index df45eec4e..ef1afc57d 100644
--- a/kcms/workspaceoptions/mainpage.ui
+++ b/kcms/workspaceoptions/mainpage.ui
@@ -1,54 +1,71 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>MainPage</class>
  <widget class="QWidget" name="MainPage">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>415</width>
     <height>110</height>
    </rect>
   </property>
   <layout class="QFormLayout" name="formLayout">
    <property name="fieldGrowthPolicy">
     <enum>QFormLayout::ExpandingFieldsGrow</enum>
    </property>
    <item row="0" column="0">
     <widget class="QLabel" name="tooltipDelayLabel">
      <property name="text">
       <string>Show Informational Tips:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
     </widget>
    </item>
    <item row="0" column="1">
     <widget class="QCheckBox" name="showToolTips">
      <property name="text">
       <string/>
      </property>
      <property name="checked">
       <bool>true</bool>
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
+   <item row="2" column="1">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>214</height>
       </size>
      </property>
     </spacer>
    </item>
+   <item row="1" column="1">
+    <widget class="QCheckBox" name="showOsd">
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="showOsdLabel">
+     <property name="toolTip">
+      <string>Show a popup for status changes such as brightness or volume.</string>
+     </property>
+     <property name="text">
+      <string>Visual feedback for status changes:</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>
  <connections/>
 </ui>
diff --git a/kcms/workspaceoptions/workspaceoptions.cpp b/kcms/workspaceoptions/workspaceoptions.cpp
index 8d7178545..b801ab246 100644
--- a/kcms/workspaceoptions/workspaceoptions.cpp
+++ b/kcms/workspaceoptions/workspaceoptions.cpp
@@ -1,87 +1,102 @@
 /*
  *  Copyright (C) 2009 Marco Martin <notmart@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 2 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, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 #include "workspaceoptions.h"
 
 #include "ui_mainpage.h"
 
 #include <KAboutData>
 #include <KPluginFactory>
 #include <KConfigGroup>
 
 using namespace KAuth;
 
 K_PLUGIN_FACTORY(WorkspaceOptionsModuleFactory, registerPlugin<WorkspaceOptionsModule>();)
 K_EXPORT_PLUGIN(WorkspaceOptionsModuleFactory("kcmworkspaceoptions"))
 
+static const QString s_osdKey = QStringLiteral("OSD");
 
 WorkspaceOptionsModule::WorkspaceOptionsModule(QWidget *parent, const QVariantList &args)
   : KCModule(parent, args),
     m_kwinConfig( KSharedConfig::openConfig(QStringLiteral("kwinrc"))),
     m_ownConfig( KSharedConfig::openConfig(QStringLiteral("workspaceoptionsrc"))),
     m_plasmaShellAutostart(QStringLiteral("plasmashell")),
     m_krunnerAutostart(QStringLiteral("krunner")),
     m_ui(new Ui::MainPage)
 {
     KAboutData *about =
     new KAboutData(QStringLiteral("kcmworkspaceoptions"), i18n("Global options for the Plasma Workspace"),
                    QStringLiteral("1.0"), QString(), KAboutLicense::GPL,
                    i18n("(c) 2009 Marco Martin"));
 
     about->addAuthor(i18n("Marco Martin"), i18n("Maintainer"), QStringLiteral("notmart@gmail.com"));
 
     setAboutData(about);
 
     setButtons(Apply);
 
     m_ui->setupUi(this);
 
     connect(m_ui->showToolTips, SIGNAL(toggled(bool)), this, SLOT(changed()));
+    connect(m_ui->showOsd, &QCheckBox::toggled, this, static_cast<void(WorkspaceOptionsModule::*)()>(&WorkspaceOptionsModule::changed));
 }
 
 WorkspaceOptionsModule::~WorkspaceOptionsModule()
 {
     delete m_ui;
 }
 
 
 void WorkspaceOptionsModule::save()
 {
+    KSharedConfig::Ptr config = KSharedConfig::openConfig(QStringLiteral("plasmarc"));
+
     {
-        KConfig config(QStringLiteral("plasmarc"));
-        KConfigGroup cg(&config, "PlasmaToolTips");
+        KConfigGroup cg(config, "PlasmaToolTips");
         cg.writeEntry("Delay", m_ui->showToolTips->isChecked() ? 0.7 : -1);
     }
 
+    {
+        KConfigGroup cg(config, QStringLiteral("OSD"));
+        cg.writeEntry("Enabled", m_ui->showOsd->isChecked());
+    }
+
 }
 
 void WorkspaceOptionsModule::load()
 {
+    KSharedConfig::Ptr config = KSharedConfig::openConfig(QStringLiteral("plasmarc"));
+
     {
-        KConfig config(QStringLiteral("plasmarc"));
-        KConfigGroup cg(&config, "PlasmaToolTips");
+        const KConfigGroup cg(config, "PlasmaToolTips");
         m_ui->showToolTips->setChecked(cg.readEntry("Delay", 0.7) > 0);
     }
+
+    {
+        const KConfigGroup cg(config, s_osdKey);
+        m_ui->showOsd->setChecked(cg.readEntry(QStringLiteral("Enabled"), true));
+    }
 }
 
 void WorkspaceOptionsModule::defaults()
 {
     m_ui->showToolTips->setChecked(true);
+    m_ui->showOsd->setChecked(true);
 }
 
 #include "workspaceoptions.moc"