diff --git a/buttons_config.module b/buttons_config.module
index edb0b982acd25fbe2c257b4a59ee5fc65ff3e224..391ffc62d10d4fbab8eae349d07be8e629c4e052 100644
--- a/buttons_config.module
+++ b/buttons_config.module
@@ -47,12 +47,18 @@ function buttons_config_form_alter(&$form, FormStateInterface $form_state, $form
     $enabled = $values['enabled'];
     $ct_name = $values['form_id'];
     $form_isSave = $values['form_type'];
-    if ($form_isSave) {
+    if ($entity_id[0] == 'comment') {
       $form_name = $ct_name . "_form";
     }
     else {
-      $form_name = $ct_name . "_edit_form";
+      if ($form_isSave) {
+        $form_name = $ct_name . "_form";
+      }
+      else {
+        $form_name = $ct_name . "_edit_form";
+      }
     }
+
     if ($enabled == 1 && $form_name == $form_id) {
       $form['actions']['submit']['#value'] = t($values['custom_text']);
     }