diff --git a/protected/humhub/docs/CHANGELOG_DEV.md b/protected/humhub/docs/CHANGELOG_DEV.md
index 2a3061de73..bbc1738f4d 100644
--- a/protected/humhub/docs/CHANGELOG_DEV.md
+++ b/protected/humhub/docs/CHANGELOG_DEV.md
@@ -18,3 +18,4 @@ HumHub Change Log
 - Enh: Added `humhub\modules\ui\form\widgets\JsInputWidget:emptyResult()` helper to manage render state of JsInputWidget
 - Enh: Added `humhub\modules\ui\form\widgets\JsInputWidget:field` in order to access ActiveField instances within JsInputWidget
 - Enh #4216: Added `humhub\modules\ui\filter\widgets\DropdownFilterInput` in order to support dropdown stream filters
+- Enh: Show more information about installed module in marketplace when possible. Instead of limited README.md 
diff --git a/protected/humhub/modules/admin/controllers/ModuleController.php b/protected/humhub/modules/admin/controllers/ModuleController.php
index 9926b679a2..a1d28d8e99 100644
--- a/protected/humhub/modules/admin/controllers/ModuleController.php
+++ b/protected/humhub/modules/admin/controllers/ModuleController.php
@@ -56,8 +56,6 @@ class ModuleController extends Controller
     public function actionIndex()
     {
         Yii::$app->moduleManager->flushCache();
-
-
         return $this->redirect(['/admin/module/list']);
     }
 
@@ -66,9 +64,33 @@ class ModuleController extends Controller
     {
         $installedModules = Yii::$app->moduleManager->getModules();
 
-        return $this->render('list', ['installedModules' => $installedModules, 'deprecatedModuleIds' => $this->getDeprecatedModules()]);
+        return $this->render('list', [
+            'installedModules' => $installedModules,
+            'deprecatedModuleIds' => $this->getDeprecatedModules(),
+            'marketplaceUrls' => $this->getMarketplaceUrls()
+        ]);
     }
 
+
+    private function getMarketplaceUrls()
+    {
+        $marketplaceUrls = [];
+
+        if (Yii::$app->hasModule('marketplace')) {
+            try {
+                foreach (Yii::$app->getModule('marketplace')->onlineModuleManager->getModules() as $id => $module) {
+                    if (!empty($module['marketplaceUrl'])) {
+                        $marketplaceUrls[$id] = $module['marketplaceUrl'];
+                    }
+                }
+            } catch (\Exception $ex) {
+            }
+        }
+
+        return $marketplaceUrls;
+    }
+
+
     private function getDeprecatedModules()
     {
         $deprecatedModuleIds = [];
@@ -79,7 +101,6 @@ class ModuleController extends Controller
                         $deprecatedModuleIds[] = $id;
                     }
                 }
-
             } catch (\Exception $ex) {
             }
         }
diff --git a/protected/humhub/modules/admin/views/module/list.php b/protected/humhub/modules/admin/views/module/list.php
index 4a62493937..08f2c82154 100644
--- a/protected/humhub/modules/admin/views/module/list.php
+++ b/protected/humhub/modules/admin/views/module/list.php
@@ -6,6 +6,7 @@ use yii\helpers\Url;
 /* @var $this \humhub\components\View */
 /* @var $installedModules array */
 /* @var $deprecatedModuleIds array */
+/* @var $marketplaceUrls array */
 ?>
 
 <div class="panel-body">
@@ -14,7 +15,9 @@ use yii\helpers\Url;
         <div><?= Yii::t('AdminModule.modules', 'No modules installed yet. Install some to enhance the functionality!'); ?></div>
     <?php endif; ?>
 
-    <?php foreach ($installedModules as $moduleId => $module) : ?>
+    <?php foreach ($installedModules
+
+                   as $moduleId => $module) : ?>
         <div class="media">
             <img class="media-object img-rounded pull-left" data-src="holder.js/64x64" alt="64x64"
                  style="width: 64px; height: 64px;" src="<?= $module->getImage(); ?>">
@@ -27,7 +30,8 @@ use yii\helpers\Url;
                         <?php endif; ?>
 
                         <?php if (in_array($module->id, $deprecatedModuleIds)): ?>
-                            <span class="label label-default" data-toggle="tooltip" data-placement="bottom" title="<?= Yii::t('AdminModule.modules', 'Not maintained or maintenance is about to be discontinued.'); ?>"><?= Yii::t('AdminModule.modules', 'Legacy'); ?></span>
+                            <span class="label label-default" data-toggle="tooltip" data-placement="bottom"
+                                  title="<?= Yii::t('AdminModule.modules', 'Not maintained or maintenance is about to be discontinued.'); ?>"><?= Yii::t('AdminModule.modules', 'Legacy'); ?></span>
                         <?php endif; ?>
                     </small>
                 </h4>
@@ -57,8 +61,14 @@ use yii\helpers\Url;
                         &middot; <?= Html::a(Yii::t('AdminModule.modules', 'Uninstall'), Url::to(['/admin/module/remove', 'moduleId' => $moduleId]), ['data-method' => 'POST', 'data-confirm' => Yii::t('AdminModule.modules', 'Are you sure? *ALL* module related data and files will be lost!')]); ?>
                     <?php endif; ?>
 
-                    &middot; <?= Html::a(Yii::t('AdminModule.modules', 'More info'), Url::to(['/admin/module/info', 'moduleId' => $moduleId]), ['data-target' => '#globalModal']); ?>
-
+                    <?php if (isset($marketplaceUrls[$moduleId])): ?>
+                        &middot; <?= Html::a(Yii::t('AdminModule.modules', 'More info') . '&nbsp;<i class="fa fa-external-link" aria-hidden="true"></i>'
+                            , $marketplaceUrls[$moduleId],
+                            ['rel' => 'noopener', 'target' => '_blank']
+                        ); ?>
+                    <?php else: ?>
+                        &middot; <?= Html::a(Yii::t('AdminModule.modules', 'More info'), Url::to(['/admin/module/info', 'moduleId' => $moduleId]), ['data-target' => '#globalModal']); ?>
+                    <?php endif; ?>
                 </div>
 
             </div>