diff --git a/web/web_support/src/main/java/com/intuit/tank/project/WorkloadScripts.java b/web/web_support/src/main/java/com/intuit/tank/project/WorkloadScripts.java
index 52ce30862..477b191e1 100644
--- a/web/web_support/src/main/java/com/intuit/tank/project/WorkloadScripts.java
+++ b/web/web_support/src/main/java/com/intuit/tank/project/WorkloadScripts.java
@@ -110,12 +110,10 @@ public void setCurrentScriptGroup(ScriptGroup currentScriptGroup) {
     public void initCurrentGroup() {
         currentScriptGroup = new ScriptGroup();
         currentScriptGroup.setLoop(1);
-        this.insertIndex = -1;
-        Map<String, String> params = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap();
-        String param = params.get("insertIndex");
-        if (param != null && NumberUtils.isCreatable(param)) {
-            insertIndex = Integer.parseInt(param);
-        }
+    }
+
+    public void setInsertIndex(int rowIndex) {
+        this.insertIndex = rowIndex;
     }
 
     /**
@@ -152,7 +150,7 @@ public void addScriptGroup() {
         if ("<Script Group Name>".equalsIgnoreCase(currentScriptGroup.getName())) {
             messages.error("Please give the Script Group a name.");
         } else {
-            currentTestPlan.addScriptGroupAt(currentScriptGroup, insertIndex);
+            currentTestPlan.addScriptGroupAt(currentScriptGroup, this.insertIndex);
         }
     }
 
diff --git a/web/web_ui/src/main/webapp/projects/workloadScripts.xhtml b/web/web_ui/src/main/webapp/projects/workloadScripts.xhtml
index e4069a96c..5bf839381 100644
--- a/web/web_ui/src/main/webapp/projects/workloadScripts.xhtml
+++ b/web/web_ui/src/main/webapp/projects/workloadScripts.xhtml
@@ -65,6 +65,7 @@
           <div class="float-left">
             <p:commandButton ajax="true" value="Insert Script Group" update=":scriptGroupPopupID" immediate="true"
               action="#{workloadScripts.initCurrentGroup}" oncomplete="PF('scriptGroupPopup').show();"
+                             actionListener="#{workloadScripts.setInsertIndex(-1)}"
               icon="ui-icon-document" style="margin: 0 0 0 10px; border-radius:5px"
               styleClass="icon-button h-space" />
           </div>
@@ -118,9 +119,9 @@
               </p:commandLink>
 
               <p:commandLink update=":scriptGroupPopupID" ajax="true"
-                action="#{workloadScripts.initCurrentGroup(testPlan)}" immediate="true"
+                action="#{workloadScripts.initCurrentGroup()}" immediate="true"
+                             actionListener="#{workloadScripts.setInsertIndex(rowIndex)}"
                 oncomplete="PF('scriptGroupPopup').show();">
-                <f:param name="insertIndex" value="#{rowIndex}" />
                 <h:graphicImage library="gfx" name="16/application_add.png" width="16px" height="16px"
                   style="padding: 2px;" title="Insert Script Group before #{group.name}." />
               </p:commandLink>