diff --git a/package/contents/ui/ActionEditor.qml b/package/contents/ui/ActionEditor.qml
index f149a1e..199be9b 100644
--- a/package/contents/ui/ActionEditor.qml
+++ b/package/contents/ui/ActionEditor.qml
@@ -453,28 +453,20 @@ ColumnLayout {
         }
     }
     
-    function getType() {
-        return typeModel.get(cbType.currentIndex).value
-    }
-    
     function getTargetId() {
-        return targetModel.get(cbTarget.currentIndex).value
+        if(useOriginalTid) {
+            return strOiginalTid;
+        }
+        return targetModel.get(cbTarget.currentIndex).uuid;
     }
     
-    function getTtype() {
+    function getType() {
         if(useOriginalTtype) {
             return strOriginalTtype;
         }
         return typeModel.get(cbType.currentIndex).value;
     }
     
-    function getTid() {
-        if(useOriginalTid) {
-            return strOiginalTid;
-        }
-        return targetModel.get(cbTarget.currentIndex).value;
-    }
-    
     function setColourHS(phue, psat) {
         // qt expects hue and saturation as 0..1 value, so we have to convert
         var hue = 0.00001525902 * phue
diff --git a/package/contents/ui/configActions.qml b/package/contents/ui/configActions.qml
index 944c396..4c6924b 100644
--- a/package/contents/ui/configActions.qml
+++ b/package/contents/ui/configActions.qml
@@ -506,7 +506,6 @@ Item {
         var payload = "";
         payload = actionEditor.getPayload();
         if(payload) {
-            actionEditor.reset();
             if(editId < 0) {
                 var newAct = {};
                 newAct.ttype = actionEditor.getType();
@@ -525,6 +524,7 @@ Item {
                 isEditing = false;
                 
             }
+            actionEditor.reset();
         }
     }