diff --git a/mscore/palette.cpp b/mscore/palette.cpp
index 513cea13df..760e9aed8c 100644
--- a/mscore/palette.cpp
+++ b/mscore/palette.cpp
@@ -234,6 +234,8 @@ void Palette::contextMenuEvent(QContextMenuEvent* event)
       int i = idx(event->pos());
       if (i == -1) {
             // palette context menu
+            if (!_moreElements)
+                  return;
             QMenu menu;
             QAction* moreAction = menu.addAction(tr("More Elements..."));
             moreAction->setEnabled(_moreElements);
@@ -251,9 +253,12 @@ void Palette::contextMenuEvent(QContextMenuEvent* event)
       QAction* moreAction    = menu.addAction(tr("More Elements..."));
       moreAction->setEnabled(_moreElements);
 
-      if (cellAt(i) && cellAt(i)->readOnly)
+      if (filterActive || (cellAt(i) && cellAt(i)->readOnly))
             clearAction->setEnabled(false);
 
+      if (!clearAction->isEnabled() && !contextAction->isEnabled() && !moreAction->isEnabled())
+            return;
+
       QAction* action = menu.exec(mapToGlobal(event->pos()));
 
       if (action == clearAction) {
diff --git a/mscore/palettebox.cpp b/mscore/palettebox.cpp
index e8e4068c7f..c73d240f30 100644
--- a/mscore/palettebox.cpp
+++ b/mscore/palettebox.cpp
@@ -123,9 +123,6 @@ void PaletteBox::filterPalettes(const QString& text)
                  }
             else
                  b->showPalette(false);
-
-            // disable editing while palette is filtered
-            b->enableEditing(text.isEmpty());
             }
       }