diff --git a/src/cheogram/res/values/strings.xml b/src/cheogram/res/values/strings.xml
index bc35884e59447bf7e5e1e97047d38510e84e5033..23cb914f544bbdcdfed2287eb1bfe7a7631fa364 100644
--- a/src/cheogram/res/values/strings.xml
+++ b/src/cheogram/res/values/strings.xml
@@ -18,4 +18,5 @@
     <string name="action_prev">Back</string>
     <string name="action_complete">Finish</string>
     <string name="action_close">Close</string>
+    <string name="action_execute">Go</string>
 </resources>
diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index cc9ff1a10146f34f5b5e48be63367dd88284edae..8a09d45fc4875987b234e80a6e88f0dcb79f6aa7 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -1778,6 +1778,12 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
                         removeSession(this);
                         return;
                     }
+
+                    if (command.getAttribute("status").equals("executing") && actionsAdapter.getCount() < 1) {
+                        // No actions have been given, but we are not done?
+                        // This is probably a spec violation, but we should do *something*
+                        actionsAdapter.add("execute");
+                    }
                 }
 
                 if (actionsAdapter.getCount() > 0) {