diff --git a/libs/ui/kis_layer_manager.cc b/libs/ui/kis_layer_manager.cc
--- a/libs/ui/kis_layer_manager.cc
+++ b/libs/ui/kis_layer_manager.cc
@@ -434,6 +434,14 @@
         above = above->prevSibling();
     }
 
+    // select previous layer so the converted layer is still selected
+    if (srcLayer) {
+        if (srcLayer->inherits("KisShapeLayer") || srcLayer->inherits("KisCloneLayer") ) {
+            above = above->prevSibling();
+        }
+    }
+
+
     m_commandsAdapter->beginMacro(kundo2_i18n("Convert to a Paint Layer"));
     m_commandsAdapter->addNode(layer, parent, above);
     m_commandsAdapter->removeNode(source);