diff --git a/typo3/sysext/core/Documentation/Changelog/master/Feature-18586-ConfigurableWidthHeightForEditpanelInFeedit.rst b/typo3/sysext/core/Documentation/Changelog/master/Feature-18586-ConfigurableWidthHeightForEditpanelInFeedit.rst
new file mode 100644
index 0000000000000000000000000000000000000000..3ea1f992d8a585faa143ab6422aa0b92b11279cd
--- /dev/null
+++ b/typo3/sysext/core/Documentation/Changelog/master/Feature-18586-ConfigurableWidthHeightForEditpanelInFeedit.rst
@@ -0,0 +1,13 @@
+=====================================================================
+Feature: #18586 - Configurable width & height for editpanel in feedit
+=====================================================================
+
+Description
+===========
+
+It is possible to change the popup's width and height which is used in the edit panel of EXT:feedit by using User TsConfig:
+
+.. code-block:: typoscript
+
+	options.feedit.popupHeight = 700
+	options.feedit.popupWidth = 900
\ No newline at end of file
diff --git a/typo3/sysext/feedit/Classes/FrontendEditPanel.php b/typo3/sysext/feedit/Classes/FrontendEditPanel.php
index 7968218f498aa3f964420287d2737f61f67884b5..aaa202428a1d283823e305940545ea03497108ac 100644
--- a/typo3/sysext/feedit/Classes/FrontendEditPanel.php
+++ b/typo3/sysext/feedit/Classes/FrontendEditPanel.php
@@ -304,7 +304,9 @@ class FrontendEditPanel
      */
     protected function editPanelLinkWrap_doWrap($string, $url, $additionalClasses = '')
     {
-        $onclick = 'vHWin=window.open(' . GeneralUtility::quoteJSvalue($url . '&returnUrl=' . ExtensionManagementUtility::extRelPath('backend') . 'Resources/Private/Templates/Close.html') . ',\'FEquickEditWindow\',\'width=690,height=500,status=0,menubar=0,scrollbars=1,resizable=1\');vHWin.focus();return false;';
+        $width = MathUtility::forceIntegerInRange($this->backendUser->getTSConfigVal('options.feedit.popupWidth'), 690, 5000, 690);
+        $height = MathUtility::forceIntegerInRange($this->backendUser->getTSConfigVal('options.feedit.popupHeight'), 500, 5000, 500);
+        $onclick = 'vHWin=window.open(' . GeneralUtility::quoteJSvalue($url . '&returnUrl=' . ExtensionManagementUtility::extRelPath('backend') . 'Resources/Private/Templates/Close.html') . ',\'FEquickEditWindow\',\'width=' . $width . ',height=' . $height . ',status=0,menubar=0,scrollbars=1,resizable=1\');vHWin.focus();return false;';
         return '<a href="#" class="btn btn-default btn-sm ' . htmlspecialchars($additionalClasses) . '" onclick="' . htmlspecialchars($onclick) . '" class="frontEndEditIconLinks">' . $string . '</a>';
     }