diff --git a/configure.phtml b/configure.phtml
index 6f3eb8d..1c208fb 100644
--- a/configure.phtml
+++ b/configure.phtml
@@ -31,12 +31,6 @@
 			<input type="password" name="wallabag_password" id="wallabag_password" value="<?php echo FreshRSS_Context::$user_conf->wallabag_password; ?>">
 		</div>
 	</div>
-	<div class="form-group">
-		<label class="group-name" for="wallabag_feeds"><?php echo _t('ext.wallabag.feeds'); ?></label>
-		<div class="group-controls">
-			<input type="text" name="wallabag_feeds" id="wallabag_feeds" value="<?php echo FreshRSS_Context::$user_conf->wallabag_feeds; ?>">
-		</div>
-	</div>
 	<div class="form-group">
 		<label class="group-name" for="wallabag_use_tags"><?php echo _t('ext.wallabag.use_tags'); ?></label>
 		<div class="group-controls">
@@ -49,6 +43,26 @@
 			<input type="text" name="wallabag_add_tags" id="wallabag_add_tags" value="<?php echo FreshRSS_Context::$user_conf->wallabag_add_tags; ?>">
 		</div>
 	</div>
+	<fieldset> 
+		<legend><?php echo _t('ext.wallabag.feeds'); ?>:</legend> 
+		<?php 
+		$feedDAO = FreshRSS_Factory::createFeedDao();
+		foreach ($feedDAO->listFeeds() as $feed) {
+			$fid = $feed->id();
+			$fname = $feed->name();
+			if (is_array(FreshRSS_Context::$user_conf->wallabag_feeds)) {
+				$fchecked = in_array("$fid", FreshRSS_Context::$user_conf->wallabag_feeds) ? 'checked' : '';
+			} else {
+				$fchecked = '';
+			}
+			echo '<div class="form-group">';
+			echo "<label class=\"group-name\" for=\"feed$fid\">$fname</label>";
+			echo '<div class="group-controls">';
+			echo "<input type=\"checkbox\" name=\"wallabag_feeds[]\" value=\"$fid\" id=\"feed$fid\" $fchecked>";
+			echo '</div></div>';
+		}
+		?>
+	</fieldset>
 
 	<div class="form-group form-actions">
 		<div class="group-controls">
diff --git a/extension.php b/extension.php
index e5a4119..450f222 100644
--- a/extension.php
+++ b/extension.php
@@ -30,9 +30,15 @@ class WallabagExtension extends Minz_Extension {
 			FreshRSS_Context::$user_conf->wallabag_client_secret = Minz_Request::param('wallabag_client_secret');
 			FreshRSS_Context::$user_conf->wallabag_username = Minz_Request::param('wallabag_username');
 			FreshRSS_Context::$user_conf->wallabag_password = Minz_Request::param('wallabag_password');
-			FreshRSS_Context::$user_conf->wallabag_feeds = Minz_Request::param('wallabag_feeds', '');
 			FreshRSS_Context::$user_conf->wallabag_use_tags = Minz_Request::param('wallabag_use_tags', '');
 			FreshRSS_Context::$user_conf->wallabag_add_tags = Minz_Request::param('wallabag_add_tags', '');
+
+			$wallabag_feeds = Minz_Request::paramArray('wallabag_feeds');
+			if (empty($wallabag_feeds)) {
+				$wallabag_feeds = array(Minz_Request::param('wallabag_feeds'));
+			}
+			FreshRSS_Context::$user_conf->wallabag_feeds = $wallabag_feeds;
+
 			FreshRSS_Context::$user_conf->save();
 		}
 	}
@@ -70,7 +76,7 @@ class WallabagExtension extends Minz_Extension {
 		if (is_null($endpoint)) {
 			return $entry;
 		}
-		$feeds = explode(',', FreshRSS_Context::$user_conf->wallabag_feeds);
+		$feeds = FreshRSS_Context::$user_conf->wallabag_feeds;
 		$use_tags = FreshRSS_Context::$user_conf->wallabag_use_tags;
 		$add_tags = explode(',', FreshRSS_Context::$user_conf->wallabag_add_tags);
 
diff --git a/i18n/en/ext.php b/i18n/en/ext.php
index 3b0348f..99c61f2 100644
--- a/i18n/en/ext.php
+++ b/i18n/en/ext.php
@@ -7,7 +7,7 @@ return array(
 		'client_secret' => 'Wallabag Client Secret',
 		'username' => 'Wallabag Username',
 		'password' => 'Wallabag Password',
-		'feeds' => 'Feed IDs (comma seperated)',
+		'feeds' => 'Feeds',
 		'use_tags' => 'Use tags?',
 		'add_tags' => 'Additional tags (comma seperated)',
 	),