diff --git a/src/Gui/Tree.cpp b/src/Gui/Tree.cpp
index a10cf015b..63e57a34a 100644
--- a/src/Gui/Tree.cpp
+++ b/src/Gui/Tree.cpp
@@ -305,6 +305,30 @@ Qt::DropActions TreeWidget::supportedDropActions () const
     return QTreeWidget::supportedDropActions();
 }
 
+bool TreeWidget::event(QEvent *e)
+{
+#if 0
+    if (e->type() == QEvent::ShortcutOverride) {
+        QKeyEvent* ke = static_cast<QKeyEvent *>(e);
+        switch (ke->key()) {
+            case Qt::Key_Delete:
+                ke->accept();
+        }
+    }
+#endif
+    return QTreeWidget::event(e);
+}
+
+void TreeWidget::keyPressEvent(QKeyEvent *event)
+{
+#if 0
+    if (event && event->matches(QKeySequence::Delete)) {
+        event->ignore();
+    }
+#endif
+    QTreeWidget::keyPressEvent(event);
+}
+
 void TreeWidget::mouseDoubleClickEvent (QMouseEvent * event)
 {
     QTreeWidgetItem* item = itemAt(event->pos());
@@ -942,8 +966,7 @@ void DocumentItem::slotHighlightObject (const Gui::ViewProviderDocumentObject& o
             jt->second->setData(0, Qt::BackgroundColorRole,QVariant());
         break;
     default:
-        // not defined enum
-        assert(0);
+        break;
     }
 
     jt->second->setFont(0,f);
diff --git a/src/Gui/Tree.h b/src/Gui/Tree.h
index b0e6b1287..f6ce2da66 100644
--- a/src/Gui/Tree.h
+++ b/src/Gui/Tree.h
@@ -84,6 +84,8 @@ protected:
     QMimeData * mimeData (const QList<QTreeWidgetItem *> items) const;
     void dragMoveEvent(QDragMoveEvent *event);
     void dropEvent(QDropEvent *event);
+    bool event(QEvent *e);
+    void keyPressEvent(QKeyEvent *event);
     void mouseDoubleClickEvent(QMouseEvent * event);
 
 protected Q_SLOTS: