diff --git a/manualcrop.admin.inc b/manualcrop.admin.inc
index ab4f40b..61b35fd 100644
--- a/manualcrop.admin.inc
+++ b/manualcrop.admin.inc
@@ -577,7 +577,7 @@ function manualcrop_form_field_ui_field_edit_form_alter(&$form, $form_state) {
  * Implements hook_form_FORM_ID_alter().
  */
 function manualcrop_form_file_entity_file_type_form_alter(&$form, &$form_state) {
-  if (isset($form['#file_type']) && $form['#file_type']->type == 'image') {
+  if (isset($form['#file_type'])) {
     // Get the previously saved or default settings.
     $settings = variable_get('manualcrop_file_entity_settings_' . $form['#file_type']->type, manualcrop_default_widget_settings());
 
diff --git a/manualcrop.module b/manualcrop.module
index aba9e0c..63845dc 100644
--- a/manualcrop.module
+++ b/manualcrop.module
@@ -990,15 +990,19 @@ function manualcrop_insert_styles() {
  * crop functionality to the file upload form.
  */
 function manualcrop_form_file_entity_add_upload_alter(&$form, &$form_state) {
-  if ($form['#step'] == 4 && isset($form['#entity']) && $form['#entity']->type == 'image' && user_access('use manualcrop')) {
-    // Get the field instance information.
-    $instance_info = array();
-    if (!empty($form_state['build_info']['args'][0]['manualcrop'])) {
-      $instance_info = $form_state['build_info']['args'][0]['manualcrop'];
-    }
+  if (isset($form['#entity'])) {
+    $settings = variable_get('manualcrop_file_entity_settings_' . $form['#entity']->type, manualcrop_default_widget_settings());
+
+    if ($form['#step'] == 4 && $settings['manualcrop_enable'] && user_access('use manualcrop')) {
+      // Get the field instance information.
+      $instance_info = array();
+      if (!empty($form_state['build_info']['args'][0]['manualcrop'])) {
+        $instance_info = $form_state['build_info']['args'][0]['manualcrop'];
+      }
 
-    // Process the form.
-    _manualcrop_process_file_entity_form($form, $form_state, $instance_info);
+      // Process the form.
+      _manualcrop_process_file_entity_form($form, $form_state, $instance_info);
+    }
   }
 }
 
@@ -1009,13 +1013,17 @@ function manualcrop_form_file_entity_add_upload_alter(&$form, &$form_state) {
  * crop functionality to the file edit form.
  */
 function manualcrop_form_file_entity_edit_alter(&$form, &$form_state) {
-  if (isset($form['#entity']) && $form['#entity']->type == 'image' && user_access('use manualcrop')) {
-    // Try to parse the GET parameter if's missing.
-    if (!isset($_GET['manualcrop']) && strpos($_GET['q'], '?') !== FALSE) {
-      parse_str('q=' . str_replace('?', '&', $_GET['q']), $_GET);
-    }
+  if(isset($form['#entity'])) {
+    $settings = variable_get('manualcrop_file_entity_settings_' . $form['#entity']->type, manualcrop_default_widget_settings());
 
-    // Process the form.
-    _manualcrop_process_file_entity_form($form, $form_state, (isset($_GET['manualcrop']) ? $_GET['manualcrop'] : array()));
+    if ($settings['manualcrop_enable'] && user_access('use manualcrop')) {
+      // Try to parse the GET parameter if's missing.
+      if (!isset($_GET['manualcrop']) && strpos($_GET['q'], '?') !== FALSE) {
+        parse_str('q=' . str_replace('?', '&', $_GET['q']), $_GET);
+      }
+
+      // Process the form.
+      _manualcrop_process_file_entity_form($form, $form_state, (isset($_GET['manualcrop']) ? $_GET['manualcrop'] : array()));
+    }
   }
 }