diff --git a/src/BootstrapForm.php b/src/BootstrapForm.php
index 9df2c95..1164885 100644
--- a/src/BootstrapForm.php
+++ b/src/BootstrapForm.php
@@ -625,9 +625,9 @@ public function input($type, $name, $label = null, $value = null, array $options
 
         $optionsField = $this->getFieldOptions(array_except($options, ['suffix', 'prefix']), $name);
 
-        if(isset($options['prefix']) || isset($options['suffix'])) {
+        /*if(isset($options['prefix']) || isset($options['suffix'])) {
             $this->config->set('bootstrap_form.right_column_class', $this->config->get('bootstrap_form.right_column_class'). ' input-group');
-        }
+        }*/
 
         $inputElement = '';
 
@@ -640,9 +640,13 @@ public function input($type, $name, $label = null, $value = null, array $options
         if(isset($options['suffix'])) {
             $inputElement .= $options['suffix'];
         }
+        
+        $inputElement = $inputElement . $this->getHelpText($name, $optionsField);
+        
+        if (isset($options['prefix']) || isset($options['suffix'])) $inputElement = '<div class="input-group">' . $inputElement . '</div>';
 
         $wrapperOptions = $this->isHorizontal() ? ['class' => $this->getRightColumnClass()] : [];
-        $wrapperElement = '<div' . $this->html->attributes($wrapperOptions) . '>' . $inputElement . $this->getFieldError($name) . $this->getHelpText($name, $optionsField) . '</div>';
+        $wrapperElement = '<div' . $this->html->attributes($wrapperOptions) . '>' . $inputElement . $this->getFieldError($name) . '</div>';
 
         return $this->getFormGroup($name, $label, $wrapperElement);
     }