diff --git a/source/java/org/alfresco/web/bean/actions/BaseActionWizard.java b/source/java/org/alfresco/web/bean/actions/BaseActionWizard.java
index cca1ed275f..c0fb06d3c6 100644
--- a/source/java/org/alfresco/web/bean/actions/BaseActionWizard.java
+++ b/source/java/org/alfresco/web/bean/actions/BaseActionWizard.java
@@ -827,7 +827,9 @@ public abstract class BaseActionWizard extends BaseWizardBean
    }
    
    /**
-    * Build the param map for the current Action instance
+    * Build the param map for the current Action instance.
+    * <p>
+    * Based on the params set by the UI, build the params needed to create the action.
     * 
     * @return param map
     */
@@ -1063,6 +1065,7 @@ public abstract class BaseActionWizard extends BaseWizardBean
          String id = (String)this.currentActionProperties.get(PROP_SCRIPT);
          NodeRef scriptRef = new NodeRef(Repository.getStoreRef(), id);
          actionParams.put(ScriptActionExecutor.PARAM_SCRIPTREF, scriptRef);
+         actionParams.put(ScriptActionExecutor.PARAM_SPACEREF, this.navigator.getCurrentNode().getNodeRef());
       }
       
       return actionParams;
diff --git a/source/web/jsp/actions/script.jsp b/source/web/jsp/actions/script.jsp
index 1ec2183223..ac55d4a043 100644
--- a/source/web/jsp/actions/script.jsp
+++ b/source/web/jsp/actions/script.jsp
@@ -103,8 +103,8 @@
                                  </tr>
                                  <tr><td class="paddingRow"></td></tr>
                                  <tr>
-                                    <td><h:outputText value="#{msg.action_script_select}"/>:</td>
-                                    <td>
+                                    <td><nobr><h:outputText value="#{msg.action_script_select}"/>:</nobr></td>
+                                    <td width=100%>
                                        <%-- Scripts drop-down selector --%>
                                        <h:selectOneMenu value="#{WizardManager.bean.actionProperties.script}">
                                           <f:selectItems value="#{TemplateSupportBean.scriptFiles}" />