diff --git a/applets/appmenu/package/contents/ui/main.qml b/applets/appmenu/package/contents/ui/main.qml
index a04a3700b..fb002c2d1 100644
--- a/applets/appmenu/package/contents/ui/main.qml
+++ b/applets/appmenu/package/contents/ui/main.qml
@@ -1,138 +1,139 @@
 /*
  * Copyright 2013  Heena Mahour <heena393@gmail.com>
  * Copyright 2013 Sebastian Kügler <sebas@kde.org>
  * Copyright 2016 Kai Uwe Broulik <kde@privat.broulik.de>
  *
  * 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, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.0
 import QtQuick.Layouts 1.1
 import QtQuick.Controls 1.4
 
 import org.kde.plasma.plasmoid 2.0
 import org.kde.kquickcontrolsaddons 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.private.appmenu 1.0 as AppMenuPrivate
 
 Item {
     id: root
 
     readonly property bool vertical: plasmoid.formFactor === PlasmaCore.Types.Vertical
     readonly property bool view: plasmoid.configuration.compactView
     readonly property bool menuAvailable: appMenuModel.menuAvailable
 
     readonly property bool kcmAuthorized: KCMShell.authorize(["style.desktop"]).length > 0
 
     onViewChanged: {
         plasmoid.nativeInterface.view = view
     }
 
     Plasmoid.preferredRepresentation: (plasmoid.configuration.compactView || vertical) ? Plasmoid.compactRepresentation : Plasmoid.fullRepresentation
 
     Plasmoid.compactRepresentation: PlasmaComponents.ToolButton {
         readonly property int fakeIndex: 0
         Layout.fillWidth: false
         Layout.fillHeight: false
         Layout.minimumWidth: implicitWidth
         Layout.maximumWidth: implicitWidth
         enabled:  menuAvailable
         checkable: menuAvailable && plasmoid.nativeInterface.currentIndex === fakeIndex
         checked: checkable
         iconSource: i18n("application-menu")
         onClicked: plasmoid.nativeInterface.trigger(this, 0);
     }
 
     Plasmoid.fullRepresentation: GridLayout {
         id: buttonGrid
 
         Plasmoid.status: {
             if (menuAvailable && plasmoid.nativeInterface.currentIndex > -1 && buttonRepeater.count > 0) {
                 return PlasmaCore.Types.NeedsAttentionStatus;
             } else if (menuAvailable){
                 //when we're not enabled set to active to show the configure button
                 return buttonRepeater.count > 0 ? PlasmaCore.Types.ActiveStatus : PlasmaCore.Types.HiddenStatus;
             } else {
                 return PlasmaCore.Types.PassiveStatus;
             }
         }
 
         Layout.minimumWidth: implicitWidth
         Layout.minimumHeight: implicitHeight
 
         flow: root.vertical ? GridLayout.TopToBottom : GridLayout.LeftToRight
         rowSpacing: units.smallSpacing
         columnSpacing: units.smallSpacing
 
         Component.onCompleted: {
             plasmoid.nativeInterface.buttonGrid = buttonGrid
 
             // using a Connections {} doesn't work for some reason in Qt >= 5.8
             plasmoid.nativeInterface.requestActivateIndex.connect(function (index) {
                 var idx = Math.max(0, Math.min(buttonRepeater.count - 1, index))
                 var button = buttonRepeater.itemAt(index)
                 if (button) {
                     button.clicked()
                 }
             });
         }
 
         // So we can show mnemonic underlines only while Alt is pressed
         PlasmaCore.DataSource {
             id: keystateSource
             engine: "keystate"
             connectedSources: ["Alt"]
         }
 
         Repeater {
             id: buttonRepeater
             model: appMenuModel
 
             PlasmaComponents.ToolButton {
                 readonly property int buttonIndex: index
 
                 Layout.preferredWidth: minimumWidth
                 Layout.fillWidth: root.vertical
                 Layout.fillHeight: !root.vertical
                 text: {
                     var text = activeMenu;
 
                     var alt = keystateSource.data.Alt;
                     if (!alt || !alt.Pressed) {
                         // StyleHelpers.removeMnemonics
                         text = text.replace(/([^&]*)&(.)([^&]*)/g, function (match, p1, p2, p3) {
                             return p1.concat(p2, p3);
                         });
                     }
 
                     return text;
                 }
                 // fake highlighted
                 checkable: plasmoid.nativeInterface.currentIndex === index
                 checked: checkable
+                visible: text !== ""
                 onClicked: {
                     plasmoid.nativeInterface.trigger(this, index)
                 }
             }
         }
     }
 
     AppMenuPrivate.AppMenuModel {
         id: appMenuModel
         onRequestActivateIndex: plasmoid.nativeInterface.requestActivateIndex(index)
         Component.onCompleted: {
             plasmoid.nativeInterface.model = appMenuModel
         }
     }
 }