diff --git a/src/main/java/edu/harvard/iq/dataverse/ManageGroupsPage.java b/src/main/java/edu/harvard/iq/dataverse/ManageGroupsPage.java
index d08337ec832..8513ca33b47 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ManageGroupsPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ManageGroupsPage.java
@@ -35,6 +35,7 @@
 import javax.persistence.PersistenceContext;
 import org.apache.commons.lang3.StringUtils;
 
+
 /**
  * @author michaelsuo
  */
@@ -95,10 +96,24 @@ public String init() {
             return permissionsWrapper.notAuthorized();
         }
         explicitGroups = new LinkedList<>(explicitGroupService.findByOwner(getDataverseId()));
-
+        renderDeletePopup = false;
         return null;
     }
+    
+    private boolean renderDeletePopup = false;
+
+    public boolean isRenderDeletePopup() {
+        return renderDeletePopup;
+    }
 
+    public void setRenderDeletePopup(boolean renderDeletePopup) {
+        this.renderDeletePopup = renderDeletePopup;
+    }
+    
+    public void clickDeleteGroup(ExplicitGroup selectedGroup) {
+        setRenderDeletePopup(true);
+        this.selectedGroup = selectedGroup;
+    }
 
     public void setSelectedGroup(ExplicitGroup selectedGroup) {
         this.selectedGroup = selectedGroup;
diff --git a/src/main/webapp/explicitGroup-new-dialog.xhtml b/src/main/webapp/explicitGroup-new-dialog.xhtml
index dd3676b8407..96c78969ca1 100644
--- a/src/main/webapp/explicitGroup-new-dialog.xhtml
+++ b/src/main/webapp/explicitGroup-new-dialog.xhtml
@@ -22,7 +22,8 @@
                         <p:panelGrid columns="2" styleClass="noBorders">
                             <p:inputText id="explicitGroupName" styleClass="form-control" value="#{manageGroupsPage.explicitGroupName}"
                                          required="#{param['DO_GROUP_VALIDATION']}"
-                                         requiredMessage="#{bundle['dataverse.permissions.explicitGroupEditDialog.groupName.required']}"/>
+                                         requiredMessage="#{bundle['dataverse.permissions.explicitGroupEditDialog.groupName.required']}"
+                                         onkeypress="return event.keyCode !== 13;"/>
                             <p:message for="explicitGroupName"/>
                         </p:panelGrid>
                     </div>
@@ -41,7 +42,8 @@
                                          required="#{param['DO_GROUP_VALIDATION']}"
                                          requiredMessage="#{bundle['dataverse.permissions.explicitGroupEditDialog.groupIdentifier.required']}"
                                          validator="#{manageGroupsPage.validateGroupIdentifier}"
-										binding="#{manageGroupsPage.explicitGroupIdentifierField}"/>
+										binding="#{manageGroupsPage.explicitGroupIdentifierField}"
+                                                                                onkeypress="return event.keyCode !== 13;"/>
                             <p:message for="explicitGroupIdentifier"/>
                         </p:panelGrid>
                         <p class="help-block">#{bundle['dataverse.permissions.explicitGroupEditDialog.groupIdentifier.helpText']}</p>
@@ -67,6 +69,7 @@
                                         emptyMessage="#{bundle['dataverse.permissions.usersOrGroups.assignDialog.userOrGroup.invalidMsg']}"
                                         value="#{manageGroupsPage.newExplicitGroupRoleAssignees}"
                                         completeMethod="#{manageGroupsPage.completeRoleAssignee}"
+                                        onkeypress="return event.keyCode !== 13;"
                                         var="roleAssignee" 
                                         itemLabel="#{roleAssignee.displayInfo.title}" itemValue="#{roleAssignee}" converter="roleAssigneeConverter">
                             <p:column>
diff --git a/src/main/webapp/manage-groups.xhtml b/src/main/webapp/manage-groups.xhtml
index 3c70a436471..ed63540cf96 100644
--- a/src/main/webapp/manage-groups.xhtml
+++ b/src/main/webapp/manage-groups.xhtml
@@ -76,7 +76,7 @@
                                             <span class="glyphicon glyphicon-edit"></span>
                                         </p:commandLink>
                                         <p:commandLink styleClass="btn btn-default bootstrap-button-tooltip"
-                                                       action="#{manageGroupsPage.setSelectedGroup(explicitGroup)}"
+                                                       action="#{manageGroupsPage.clickDeleteGroup(explicitGroup)}"
                                                        update="@form"
                                                        oncomplete="PF('deleteConfirmation').show()"
                                                        title="#{bundle['dataverse.manageGroups.tab.action.btn.delete']}">
@@ -92,7 +92,7 @@
                             <span class="glyphicon glyphicon-warning-sign text-warning"/> <span class="text-warning">#{bundle['dataverse.manageGroups.tab.action.btn.delete.dialog.tip']}</span>
                         </p>
                         <div class="button-block">
-                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('deleteConfirmation').hide()" action="#{manageGroupsPage.deleteGroup()}" update="manageGroupsForm,messagePanel"/>
+                            <p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" rendered="#{manageGroupsPage.renderDeletePopup}"  onclick="PF('deleteConfirmation').hide()" action="#{manageGroupsPage.deleteGroup()}" update="manageGroupsForm,messagePanel"/>
                             <p:commandButton styleClass="btn btn-link" value="#{bundle.cancel}" onclick="PF('deleteConfirmation').hide()"/>
                         </div>
                     </p:dialog>
@@ -122,6 +122,7 @@
                                                     value="#{manageGroupsPage.selectedGroupAddRoleAssignees}"
                                                     completeMethod="#{manageGroupsPage.completeRoleAssignee}"
                                                     var="roleAssignee"
+                                                    onkeypress="return event.keyCode !== 13;"
                                                     styleClass="DropdownPopup" panelStyleClass="DropdownPopupPanel"
                                                     itemLabel="#{roleAssignee.displayInfo.title}" itemValue="#{roleAssignee}" converter="roleAssigneeConverter">
                                         <p:column>
@@ -166,7 +167,7 @@
                         </p:dataTable>
                         <!-- Add Group Members -->
                         <div class="button-block">
-                            <p:commandButton id="saveGroup" styleClass="btn btn-default"
+                            <p:commandButton id="saveGroup" styleClass="btn btn-default" rendered="#{manageGroupsPage.getSelectedGroup()!=null}"
                                            actionListener="#{manageGroupsPage.saveExplicitGroup}"
                                            value="#{bundle.saveChanges}"
                                            update="manageGroupsForm,messagePanel">