diff --git a/src/Raven.Studio/typescript/viewmodels/database/tasks/editAzureQueueStorageEtlTask.ts b/src/Raven.Studio/typescript/viewmodels/database/tasks/editAzureQueueStorageEtlTask.ts
index 52d246eec822..4fddc29f063c 100644
--- a/src/Raven.Studio/typescript/viewmodels/database/tasks/editAzureQueueStorageEtlTask.ts
+++ b/src/Raven.Studio/typescript/viewmodels/database/tasks/editAzureQueueStorageEtlTask.ts
@@ -161,7 +161,7 @@ class editAzureQueueStorageEtlTask extends viewModelBase {
     view = require("views/database/tasks/editAzureQueueStorageEtlTask.html");
     optionsPerQueueEtlView = require("views/database/tasks/optionsPerQueueEtl.html");
     connectionStringView = require("views/database/settings/connectionStringAzureQueueStorage.html");
-    pinResponsibleNodeButtonsScriptView = require("views/partial/pinResponsibleNodeButtonsScript.html");
+    taskResponsibleNodeSectionView = require("views/partial/taskResponsibleNodeSection.html");
     pinResponsibleNodeTextScriptView = require("views/partial/pinResponsibleNodeTextScript.html");
 
     static readonly scriptNamePrefix = "Script_";
diff --git a/src/Raven.Studio/wwwroot/App/views/database/tasks/editAzureQueueStorageEtlTask.html b/src/Raven.Studio/wwwroot/App/views/database/tasks/editAzureQueueStorageEtlTask.html
index de1fb326a5ea..b8e5303283f5 100644
--- a/src/Raven.Studio/wwwroot/App/views/database/tasks/editAzureQueueStorageEtlTask.html
+++ b/src/Raven.Studio/wwwroot/App/views/database/tasks/editAzureQueueStorageEtlTask.html
@@ -66,30 +66,7 @@ <h2 data-bind="text: $root.isAddingNewEtlTask() ? 'New Azure Storage Queue ETL'
                                 <label for="responsibleNode">Set responsible node</label>
                             </div>
                         </div>
-                        <div data-bind="validationElement: mentorNode, collapse: manualChooseMentor">
-                            <div class="form-group" data-bind="css: { 'margin-bottom-xs': mentorNode() }">
-                                <div>
-                                    <label class="control-label">Responsible Node</label>
-                                </div>
-                                <div class="flex-grow">
-                                    <button class="btn btn-block dropdown-toggle text-left" data-toggle="dropdown">
-                                        <span data-bind="text: mentorNode() ? 'Node ' + mentorNode() : 'Select responsible node'"></span>
-                                        <span class="caret"></span>
-                                    </button>
-                                    <ul class="dropdown-menu" data-bind="foreach: $root.possibleMentors">
-                                        <li><a href="#" data-bind="text: 'Node ' + $data, click: $parent.mentorNode.bind($parent.mentorNode, $data)"></a></li>
-                                    </ul>
-                                    <span class="help-block" data-bind="validationMessage: mentorNode"></span>
-                                </div>
-                                <div data-bind="compose: $root.pinResponsibleNodeButtonsScriptView"></div>
-                            </div>
-                            <div data-bind="visible: mentorNode">
-                                <div class="form-group small">
-                                    <label class="control-label">&nbsp;</label>
-                                    <div class="flex-grow" data-bind="compose: $root.pinResponsibleNodeTextScriptView"></div>
-                                </div>
-                            </div>
-                        </div>
+                        <div data-bind="compose: $root.taskResponsibleNodeSectionView"></div>
                         <div class="form-group">
                             <label class="control-label">&nbsp;</label>
                             <div class="toggle">