diff --git a/lib/Form/Widget.php b/lib/Form/Widget.php
index 4f8b375694..0390889de8 100644
--- a/lib/Form/Widget.php
+++ b/lib/Form/Widget.php
@@ -89,7 +89,7 @@ class Widget extends \WP_Widget {
   }
 
   function setupDependencies() {
-    if(!is_active_widget(false, false, $this->id_base, true)) return;
+    if(wp_script_is('mailpoet_public', 'enqueued')) return;
 
     wp_enqueue_style(
       'mailpoet_public',
diff --git a/tests/acceptance/SubscriptionFormCest.php b/tests/acceptance/SubscriptionFormCest.php
index 6c6d62fed6..a909615afe 100644
--- a/tests/acceptance/SubscriptionFormCest.php
+++ b/tests/acceptance/SubscriptionFormCest.php
@@ -25,6 +25,17 @@ class SubscriptionFormCest {
     $I->cli('widget reset sidebar-1 --allow-root');
   }
 
+  function subscriptionFormShortcode(\AcceptanceTester $I) {
+    $I->wantTo('Subscribe using form shortcode');
+
+    $I->amOnPage('/form-test');
+    $I->fillField('[data-automation-id=\'form_email\']', $this->subscriber_email);
+    $I->click('.mailpoet_submit');
+    $I->waitForText('Check your inbox or spam folder to confirm your subscription.', self::CONFIRMATION_MESSAGE_TIMEOUT, '.mailpoet_validate_success');
+    $I->seeNoJSErrors();
+    $I->seeCurrentUrlEquals('/form-test');
+  }
+
   function subscriptionFormIframe(\AcceptanceTester $I) {
     $I->wantTo('Subscribe using iframe form');