diff --git a/modules/openlayers_ui/includes/openlayers_ui.theme.inc b/modules/openlayers_ui/includes/openlayers_ui.theme.inc
index 9c00188..c3a5a4d 100644
--- a/modules/openlayers_ui/includes/openlayers_ui.theme.inc
+++ b/modules/openlayers_ui/includes/openlayers_ui.theme.inc
@@ -11,6 +11,9 @@
  * Theme function for form description of layers
  */
 function theme_openlayers_ui_form_layer_description($args) {
+  if (!empty($args['layer_link'])) {
+    $args['layer_title'] = l($args['layer_title'], $args['layer_link']);
+  }
   return $args['layer_title'] . ($args['layer_description'] ?
     ': <span class="openlayers-form-layer-description">' .
     $args['layer_description'] . '</span>' :
diff --git a/modules/openlayers_ui/openlayers_ui.module b/modules/openlayers_ui/openlayers_ui.module
index 39c2562..c2ffc1c 100644
--- a/modules/openlayers_ui/openlayers_ui.module
+++ b/modules/openlayers_ui/openlayers_ui.module
@@ -707,14 +707,20 @@ function openlayers_ui_get_layer_options($type = 'baselayer',
         $options[$key] = theme('openlayers_ui_form_layer_description',
           array(
             'layer_title' => $layer->title,
-            'layer_description' => $layer->description));
+            'layer_description' => $layer->description,
+            'layer_link' => $layer->export_type & EXPORT_IN_DATABASE ?
+              "admin/structure/openlayers/layers/{$layer->name}/edit" : NULL
+            ));
       }
       elseif ($type != 'baselayer' &&
         empty($layer->data['baselayer'])) {
         $options[$key] = theme('openlayers_ui_form_layer_description',
           array(
             'layer_title' => $layer->title,
-            'layer_description' => $layer->description));
+            'layer_description' => $layer->description,
+            'layer_link' => $layer->export_type & EXPORT_IN_DATABASE ?
+              "admin/structure/openlayers/layers/{$layer->name}/edit" : NULL
+            ));
       }
     }
   }