diff --git a/openstack_dashboard/dashboards/project/security_groups/forms.py b/openstack_dashboard/dashboards/project/security_groups/forms.py
index 4d85aa941f..8359f914d8 100644
--- a/openstack_dashboard/dashboards/project/security_groups/forms.py
+++ b/openstack_dashboard/dashboards/project/security_groups/forms.py
@@ -377,6 +377,35 @@ class AddRule(forms.SelfHandlingForm):
         else:
             self._apply_rule_menu(cleaned_data, rule_menu)
 
+    def _adjust_ip_protocol_of_icmp(self, data):
+        # Note that this needs to be called after IPv4/IPv6 is determined.
+        try:
+            ip_protocol = int(data['ip_protocol'])
+        except ValueError:
+            # string representation of IP protocol
+            ip_protocol = data['ip_protocol']
+        is_ipv6 = data['ethertype'] == 'IPv6'
+
+        if isinstance(ip_protocol, int):
+            # When IP protocol number is specified, we assume a user
+            # knows more detail on IP protocol number,
+            # so a warning message on a mismatch between IP proto number
+            # and IP version is displayed.
+            if is_ipv6 and ip_protocol == 1:
+                msg = _('58 (ipv6-icmp) should be specified for IPv6 '
+                        'instead of 1.')
+                self._errors['ip_protocol'] = self.error_class([msg])
+            elif not is_ipv6 and ip_protocol == 58:
+                msg = _('1 (icmp) should be specified for IPv4 '
+                        'instead of 58.')
+                self._errors['ip_protocol'] = self.error_class([msg])
+        else:
+            # ICMPv6 uses different an IP protocol name and number.
+            # To allow 'icmp' for both IPv4 and IPv6 in the form,
+            # we need to replace 'icmp' with 'ipv6-icmp' based on IP version.
+            if is_ipv6 and ip_protocol == 'icmp':
+                data['ip_protocol'] = 'ipv6-icmp'
+
     def clean(self):
         cleaned_data = super(AddRule, self).clean()
 
@@ -411,6 +440,8 @@ class AddRule(forms.SelfHandlingForm):
                 ip_ver = netaddr.IPNetwork(cidr).version
                 cleaned_data['ethertype'] = 'IPv6' if ip_ver == 6 else 'IPv4'
 
+        self._adjust_ip_protocol_of_icmp(cleaned_data)
+
         return cleaned_data
 
     def handle(self, request, data):