diff --git a/docs/release-notes/version-2.7.md b/docs/release-notes/version-2.7.md
index a58c7e9f1..142c11244 100644
--- a/docs/release-notes/version-2.7.md
+++ b/docs/release-notes/version-2.7.md
@@ -14,6 +14,7 @@
 * [#4056](https://github.com/netbox-community/netbox/issues/4056) - Repair schema migration for Rack.outer_unit (from #3569)
 * [#4067](https://github.com/netbox-community/netbox/issues/4067) - Correct permission checked when creating a rack (vs. editing)
 * [#4071](https://github.com/netbox-community/netbox/issues/4071) - Enforce "view tag" permission on individual tag view
+* [#4079](https://github.com/netbox-community/netbox/issues/4079) - Fix assignment of power panel when bulk editing power feeds
 
 ---
 
diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index dbb3a3bb4..8619d6844 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -4371,7 +4371,7 @@ class PowerFeedBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEd
         queryset=PowerFeed.objects.all(),
         widget=forms.MultipleHiddenInput
     )
-    powerpanel = forms.ModelChoiceField(
+    power_panel = forms.ModelChoiceField(
         queryset=PowerPanel.objects.all(),
         required=False,
         widget=APISelect(
diff --git a/netbox/dcim/tests/test_views.py b/netbox/dcim/tests/test_views.py
index 9dd5c6114..32789accd 100644
--- a/netbox/dcim/tests/test_views.py
+++ b/netbox/dcim/tests/test_views.py
@@ -1331,9 +1331,6 @@ class PowerPanelTestCase(StandardTestCases.Views):
 class PowerFeedTestCase(StandardTestCases.Views):
     model = PowerFeed
 
-    # TODO: Re-enable this test once #4079 is fixed
-    test_bulk_edit_objects = None
-
     @classmethod
     def setUpTestData(cls):