diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py
index c4db4ef83..581ed76bf 100644
--- a/netbox/dcim/filters.py
+++ b/netbox/dcim/filters.py
@@ -1126,6 +1126,10 @@ class PowerFeedFilter(CustomFieldFilterSet):
         to_field_name='slug',
         label='Site name (slug)',
     )
+    power_panel_id = django_filters.ModelMultipleChoiceFilter(
+        queryset=PowerPanel.objects.all(),
+        label='Power panel (ID)',
+    )
     rack_id = django_filters.ModelMultipleChoiceFilter(
         field_name='rack',
         queryset=Rack.objects.all(),
diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index d02241560..f28a35997 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -2681,7 +2681,7 @@ class ConnectCableToPowerFeedForm(BootstrapMixin, ChainedFieldsMixin, forms.Mode
         widget=APISelect(
             api_url='/api/dcim/power-panels/',
             filter_for={
-                'termination_b_powerfeed': 'powerpanel_id',
+                'termination_b_id': 'power_panel_id',
             }
         )
     )
diff --git a/netbox/templates/dcim/inc/powerport.html b/netbox/templates/dcim/inc/powerport.html
index 458d1267a..c3a83ad69 100644
--- a/netbox/templates/dcim/inc/powerport.html
+++ b/netbox/templates/dcim/inc/powerport.html
@@ -42,9 +42,15 @@
         {% if pp.cable %}
             {% include 'dcim/inc/cable_toggle_buttons.html' with cable=pp.cable %}
         {% elif perms.dcim.add_cable %}
-            <a href="{% url 'dcim:powerport_connect' termination_a_id=pp.pk %}?return_url={{ device.get_absolute_url }}" title="Connect" class="btn btn-success btn-xs">
-                <i class="glyphicon glyphicon-resize-small" aria-hidden="true"></i>
-            </a>
+            <span class="dropdown">
+                <button type="button" class="btn btn-success btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    <span class="glyphicon glyphicon-resize-small" aria-hidden="true"></span>
+                </button>
+                <ul class="dropdown-menu dropdown-menu-right">
+                    <li><a href="{% url 'dcim:powerport_connect' termination_a_id=pp.pk %}?return_url={{ device.get_absolute_url }}">Power Outlet</a></li>
+                    <li><a href="{% url 'dcim:powerport_connect' termination_a_id=pp.pk %}?type=powerfeed&return_url={{ device.get_absolute_url }}">Power Feed</a></li>
+                </ul>
+            </span>
         {% endif %}
         {% if perms.dcim.change_powerport %}
             <a href="{% url 'dcim:powerport_edit' pk=pp.pk %}" title="Edit port" class="btn btn-info btn-xs">