diff --git a/src/objects/zcl_abapgit_object_para.clas.abap b/src/objects/zcl_abapgit_object_para.clas.abap
index 5cc04d8ad..ccd11bfb0 100644
--- a/src/objects/zcl_abapgit_object_para.clas.abap
+++ b/src/objects/zcl_abapgit_object_para.clas.abap
@@ -105,20 +105,77 @@ CLASS zcl_abapgit_object_para IMPLEMENTATION.
 
   METHOD zif_abapgit_object~delete.
 
-    DATA: lv_paramid TYPE tpara-paramid.
+    " We can't use FM RS_PARAMETER_DELETE because of the popup to confirm
+    "Therefore we have to reimplement most of the FMs logic
 
+    DATA: lv_paramid   TYPE tpara-paramid,
+          ls_transpkey TYPE trkey.
 
     lv_paramid = ms_item-obj_name.
-    CALL FUNCTION 'RS_PARAMETER_DELETE'
+
+    CALL FUNCTION 'RS_ACCESS_PERMISSION'
       EXPORTING
-        objectname = lv_paramid
+        global_lock              = abap_true
+        language_upd_exit        = 'RS_PARAMETER_LANGUAGE_EXIT'    " Name FuBa for maintenance language change
+        object                   = lv_paramid
+        object_class             = ms_item-obj_type
+        suppress_language_check  = space
       EXCEPTIONS
-        cancelled  = 1
-        OTHERS     = 2.
+        canceled_in_corr         = 1
+        enqueued_by_user         = 2
+        enqueue_system_failure   = 3
+        illegal_parameter_values = 4
+        locked_by_author         = 5
+        no_modify_permission     = 6
+        no_show_permission       = 7
+        permission_failure       = 8
+        request_language_denied  = 9
+        OTHERS                   = 10.
     IF sy-subrc <> 0.
       zcx_abapgit_exception=>raise( 'error from RS_PRAMETER_DELETE' ).
     ENDIF.
 
+    SELECT COUNT(*) FROM cross WHERE ( type = 'P' OR
+                               type = 'Q' )
+                              AND name   = lv_paramid.
+    IF sy-subrc = 0.
+      zcx_abapgit_exception=>raise( 'PARA: Parameter is still used' ).
+    ELSE.
+      SELECT COUNT(*) FROM dd04l BYPASSING BUFFER
+      WHERE  memoryid = lv_paramid
+      AND as4local = 'A'.
+      IF sy-subrc = 0.
+        zcx_abapgit_exception=>raise( 'PARA: Parameter is still used' ).
+      ENDIF.
+    ENDIF.
+    CALL FUNCTION 'RS_CORR_INSERT'
+      EXPORTING
+        global_lock         = abap_true
+        object              = lv_paramid
+        object_class        = 'PARA'
+        mode                = 'D'
+      IMPORTING
+        transport_key       = ls_transpkey
+      EXCEPTIONS
+        cancelled           = 01
+        permission_failure  = 02
+        unknown_objectclass = 03.
+
+    IF sy-subrc = 0.
+      DELETE FROM tpara WHERE paramid = lv_paramid.
+      DELETE FROM tparat WHERE paramid = lv_paramid.
+
+      IF sy-subrc = 0.
+        CALL FUNCTION 'RS_TREE_OBJECT_PLACEMENT'
+          EXPORTING
+            object    = lv_paramid
+            operation = 'DELETE'
+            type      = 'CR'.
+      ENDIF.
+    ELSE.
+      zcx_abapgit_exception=>raise( 'error from RS_PRAMETER_DELETE' ).
+    ENDIF.
+
   ENDMETHOD.
 
   METHOD zif_abapgit_object~jump.