diff --git a/src/Gui/View3DInventorSelection.cpp b/src/Gui/View3DInventorSelection.cpp
index b9ffd01b30..9ba72ddb04 100644
--- a/src/Gui/View3DInventorSelection.cpp
+++ b/src/Gui/View3DInventorSelection.cpp
@@ -191,10 +191,7 @@ void View3DInventorSelection::checkGroupOnTop(const SelectionChanges& Reason)
     // onTop==2 means on top only if whole object is selected,
     // onTop==3 means on top only if some sub-element is selected
     // onTop==1 means either
-    if (Gui::Selection().needPickedList()) {
-        onTop = 1;
-    }
-    else if (vp->OnTopWhenSelected.getValue()) {
+    if (vp->OnTopWhenSelected.getValue()) {
         onTop = vp->OnTopWhenSelected.getValue();
     }
     else {
diff --git a/src/Mod/Part/Gui/SoBrepFaceSet.cpp b/src/Mod/Part/Gui/SoBrepFaceSet.cpp
index f5b4d0daa5..c1ae8a5770 100644
--- a/src/Mod/Part/Gui/SoBrepFaceSet.cpp
+++ b/src/Mod/Part/Gui/SoBrepFaceSet.cpp
@@ -854,20 +854,12 @@ bool SoBrepFaceSet::overrideMaterialBinding(SoGLRenderAction* action, SelContext
 
     if ((mb == SoMaterialBindingElement::OVERALL
          || (mb == SoMaterialBindingElement::PER_PART && diffuse_size >= partIndex.getNum()))
-        && ((ctx && Gui::Selection().needPickedList()) || trans0 != 0.0
-            || (ctx2 && !ctx2->colors.empty()))) {
+        && (trans0 != 0.0 || (ctx2 && !ctx2->colors.empty()))) {
         state->push();
 
         packedColors.clear();
 
-        if (ctx && Gui::Selection().needPickedList()) {
-            hasTransparency = true;
-            trans_size = 1;
-            if (ctx2) {
-                ctx2->trans0 = trans0;
-            }
-        }
-        else if (ctx2) {
+        if (ctx2) {
             ctx2->trans0 = 0.0;
         }