diff --git a/e2e/full/wiki.e2e.js b/e2e/full/wiki.e2e.js
index 6b2dd873..86dbfe6c 100644
--- a/e2e/full/wiki.e2e.js
+++ b/e2e/full/wiki.e2e.js
@@ -30,8 +30,11 @@ describe('wiki', function() {
     it('follow last link', async function() {
         // the click event is not on the <a> :(
         let lastLink = wikiHelper.links().get().last().$('.link-title');
-
-        utils.common.link(lastLink);
+        browser
+           .actions()
+           .mouseMove(lastLink)
+           .click()
+           .perform();
 
         await utils.common.waitLoader();
         await utils.common.takeScreenshot("wiki", "new-link-created-with-empty-wiki-page");
diff --git a/e2e/helpers/detail-helper.js b/e2e/helpers/detail-helper.js
index cb17c8ed..3f4d38b2 100644
--- a/e2e/helpers/detail-helper.js
+++ b/e2e/helpers/detail-helper.js
@@ -294,7 +294,7 @@ helper.attachment = function() {
             await el.$$('div[tg-attachment] .attachment-settings .icon-edit').last().click();
             await el.$$('div[tg-attachment] .editable-attachment-comment input').last().sendKeys(name);
             await browser.actions().sendKeys(protractor.Key.ENTER).perform();
-            await browser.waitForAngular();
+            return browser.waitForAngular();
         },
 
         getFirstAttachmentName: async function () {