diff --git a/src/Module/Pinned.php b/src/Module/Item/Pin.php
similarity index 58%
rename from src/Module/Pinned.php
rename to src/Module/Item/Pin.php
index 97364ceffb..d99b1a3452 100644
--- a/src/Module/Pinned.php
+++ b/src/Module/Item/Pin.php
@@ -19,42 +19,58 @@
  *
  */
 
-namespace Friendica\Module;
+namespace Friendica\Module\Item;
 
 use Friendica\BaseModule;
+use Friendica\Core\Session;
+use Friendica\Core\System;
 use Friendica\DI;
 use Friendica\Model\Item;
+use Friendica\Network\HTTPException;
 
 /**
  * Toggle pinned items
  */
-class Pinned extends BaseModule
+class Pin extends BaseModule
 {
 	public static function rawContent(array $parameters = [])
 	{
-		if (!local_user()) {
-			throw new \Friendica\Network\HTTPException\ForbiddenException();
+		$l10n = DI::l10n();
+
+		if (!Session::isAuthenticated()) {
+			throw new HttpException\ForbiddenException($l10n->t('Access denied.'));
 		}
 
-		if (empty($parameters['item'])) {
-			throw new \Friendica\Network\HTTPException\BadRequestException();
+		if (empty($parameters['id'])) {
+			throw new HTTPException\BadRequestException();
 		}
 
-		$itemId = intval($parameters['item']);
+		$itemId = intval($parameters['id']);
 
 		$pinned = !Item::getPinned($itemId, local_user());
 
 		Item::setPinned($itemId, local_user(), $pinned);
 
 		// See if we've been passed a return path to redirect to
-		$returnPath = $_REQUEST['return'] ?? '';
-		if (!empty($returnPath)) {
-			$rand = '_=' . time() . (strpos($returnPath, '?') ? '&' : '?') . 'rand';
-			DI::baseUrl()->redirect($returnPath . $rand);
+		$return_path = $_REQUEST['return'] ?? '';
+		if (!empty($return_path)) {
+			$rand = '_=' . time();
+			if (strpos($return_path, '?')) {
+				$rand = "&$rand";
+			} else {
+				$rand = "?$rand";
+			}
+
+			DI::baseUrl()->redirect($return_path . $rand);
 		}
 
-		// the json doesn't really matter, it will either be 0 or 1
-		echo json_encode((int)$pinned);
-		exit();
+		$return = [
+			'status'  => 'ok',
+			'item_id' => $itemId,
+			'verb'    => 'pin',
+			'state'   => (int)$pinned,
+		];
+
+		System::jsonExit($return);
 	}
 }
diff --git a/static/routes.config.php b/static/routes.config.php
index 8108c24cdc..5a2ee2ffd1 100644
--- a/static/routes.config.php
+++ b/static/routes.config.php
@@ -292,6 +292,7 @@ return [
 
 	'/item'            => [
 		'/ignore/{id}' => [Module\Item\Ignore::class, [R::GET]],
+		'/{id:\d+}/pin' => [Module\Item\Pin::class,       [        R::POST]],
 	],
 
 	'/like/{item:\d+}'    => [Module\Like::class,            [R::GET]],
@@ -351,7 +352,6 @@ return [
 		'/{type}/{customize}/{name}' => [Module\Photo::class, [R::GET]],
 	],
 
-	'/pinned/{item:\d+}' => [Module\Pinned::class,       [R::GET]],
 	'/pretheme'          => [Module\ThemeDetails::class, [R::GET]],
 	'/probe'             => [Module\Debug\Probe::class,  [R::GET]],
 
diff --git a/view/js/main.js b/view/js/main.js
index 089f780103..1503529d1f 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -704,9 +704,9 @@ function dostar(ident) {
 function doPin(ident) {
 	ident = ident.toString();
 	$('#like-rotator-' + ident).show();
-	$.get('pinned/' + ident)
+	$.post('item/' + ident + '/pin')
 	.then(function(data) {
-		if (data.match(/1/)) {
+		if (data.state === 1) {
 			$('#pinned-' + ident)
 				.addClass('pinned')
 				.removeClass('unpinned');