diff --git a/apps/files_imageviewer/appinfo/app.php b/apps/files_imageviewer/appinfo/app.php
index bc0059b8b663198df2e95a6c5635dcde30c7f163..50a7253e01b6ee243f2117b889c38e140180de57 100644
--- a/apps/files_imageviewer/appinfo/app.php
+++ b/apps/files_imageviewer/appinfo/app.php
@@ -1,6 +1,8 @@
 <?php
 
-OC_UTIL::addScript( 'files_imageviewer', 'lightbox' );
-OC_UTIL::addStyle( 'files_imageviewer', 'lightbox' );
+if(OC_APP::getCurrentApp()=='files'){
+	OC_UTIL::addScript( 'files_imageviewer', 'lightbox' );
+	OC_UTIL::addStyle( 'files_imageviewer', 'lightbox' );
+}
 
 ?>
diff --git a/apps/files_imageviewer/appinfo/info.xml b/apps/files_imageviewer/appinfo/info.xml
index f658409be79a7214772321b2fa619fedaf9e08bd..f3b5a67960ebcb905942648d66dfd3b027dd2b66 100644
--- a/apps/files_imageviewer/appinfo/info.xml
+++ b/apps/files_imageviewer/appinfo/info.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <info>
-	<id>files_imageview</id>
-	<name>Imageviewer</name>
+	<id>files_imageviewer</id>
+	<name>Image Viewer</name>
 	<description>Simple image viewer for owncloud</description>
 	<version>1.0</version>
 	<licence>AGPL</licence>