diff --git a/js/src/components/Resource/ResourceItem.vue b/js/src/components/Resource/ResourceItem.vue
index 58b570768..fbac3cb9e 100644
--- a/js/src/components/Resource/ResourceItem.vue
+++ b/js/src/components/Resource/ResourceItem.vue
@@ -45,7 +45,7 @@
     </a>
     <resource-dropdown
       class="actions"
-      v-if="!inline || !preview"
+      v-if="!inline && !preview"
       @delete="$emit('delete', resource.id)"
       @move="$emit('move', resource)"
       @rename="$emit('rename', resource)"
diff --git a/js/src/components/Resource/ResourceSelector.vue b/js/src/components/Resource/ResourceSelector.vue
index 90ccb6024..5ecdcf4f5 100644
--- a/js/src/components/Resource/ResourceSelector.vue
+++ b/js/src/components/Resource/ResourceSelector.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-if="resource">
     <article class="panel is-primary">
-      <p class="panel-heading">
+      <p class="panel-heading truncate">
         {{
           $t('Move "{resourceName}"', { resourceName: initialResource.title })
         }}
@@ -28,7 +28,7 @@
       </a>
       <template v-if="resource.children">
         <a
-          class="panel-block"
+          class="panel-block flex-wrap"
           v-for="element in resource.children.elements"
           :class="{
             clickable:
@@ -37,15 +37,17 @@
           :key="element.id"
           @click="goDown(element)"
         >
-          <span class="panel-icon">
-            <b-icon
-              icon="folder"
-              size="is-small"
-              v-if="element.type === 'folder'"
-            />
-            <b-icon icon="link" size="is-small" v-else />
-          </span>
-          {{ element.title }}
+          <p class="truncate">
+            <span class="panel-icon">
+              <b-icon
+                icon="folder"
+                size="is-small"
+                v-if="element.type === 'folder'"
+              />
+              <b-icon icon="link" size="is-small" v-else />
+            </span>
+            <span>{{ element.title }}</span>
+          </p>
           <span v-if="element.id === initialResource.id">
             <em v-if="element.type === 'folder'"> {{ $t("(this folder)") }}</em>
             <em v-else> {{ $t("(this link)") }}</em>
@@ -89,7 +91,7 @@
   </div>
 </template>
 <script lang="ts">
-import { Component, Vue, Prop } from "vue-property-decorator";
+import { Component, Vue, Prop, Watch } from "vue-property-decorator";
 import { GET_RESOURCE } from "../../graphql/resources";
 import { IResource } from "../../types/resource";
 
@@ -119,7 +121,7 @@ export default class ResourceSelector extends Vue {
 
   @Prop({ required: true }) username!: string;
 
-  resource: IResource | undefined = this.initialResource.parent;
+  resource: IResource | undefined = undefined;
 
   RESOURCES_PER_PAGE = 10;
 
@@ -131,6 +133,20 @@ export default class ResourceSelector extends Vue {
     }
   }
 
+  data() {
+    return {
+      resource: this.initialResource?.parent,
+    };
+  }
+
+  @Watch("initialResource")
+  updateResourceFromProp() {
+    if (this.initialResource) {
+      this.resource = this.initialResource?.parent;
+      this.$apollo.queries.resource.refetch();
+    }
+  }
+
   updateResource(): void {
     this.$emit(
       "update-resource",
diff --git a/js/src/views/Resources/ResourceFolder.vue b/js/src/views/Resources/ResourceFolder.vue
index 6772ce9a8..c14e2318a 100644
--- a/js/src/views/Resources/ResourceFolder.vue
+++ b/js/src/views/Resources/ResourceFolder.vue
@@ -9,10 +9,7 @@
             <b-icon icon="folder" />
             {{ $t("New folder") }}
           </b-dropdown-item>
-          <b-dropdown-item
-            aria-role="listitem"
-            @click="createLinkResourceModal = true"
-          >
+          <b-dropdown-item aria-role="listitem" @click="createLinkModal">
             <b-icon icon="link" />
             {{ $t("New link") }}
           </b-dropdown-item>
@@ -124,7 +121,11 @@
         <section class="modal-card-body">
           <form @submit.prevent="renameResource">
             <b-field :label="$t('Title')">
-              <b-input aria-required="true" v-model="updatedResource.title" />
+              <b-input
+                ref="resourceRenameInput"
+                aria-required="true"
+                v-model="updatedResource.title"
+              />
             </b-field>
 
             <b-button native-type="submit">{{
@@ -154,12 +155,17 @@
       :active.sync="createResourceModal"
       has-modal-card
       :close-button-aria-label="$t('Close')"
+      trap-focus
     >
       <div class="modal-card">
         <section class="modal-card-body">
+          <b-message type="is-danger" v-if="modalError">
+            {{ modalError }}
+          </b-message>
           <form @submit.prevent="createResource">
             <b-field :label="$t('Title')" label-for="new-resource-title">
               <b-input
+                ref="modalNewResourceInput"
                 aria-required="true"
                 v-model="newResource.title"
                 id="new-resource-title"
@@ -179,6 +185,7 @@
       class="link-resource-modal"
       aria-modal
       :close-button-aria-label="$t('Close')"
+      trap-focus
     >
       <div class="modal-card">
         <section class="modal-card-body">
@@ -193,6 +200,7 @@
                 required
                 v-model="newResource.resourceUrl"
                 @blur="previewResource"
+                ref="modalNewResourceLinkInput"
               />
             </b-field>
 
@@ -355,6 +363,12 @@ export default class Resources extends Mixins(ResourceMixin) {
     put: true,
   };
 
+  $refs!: {
+    resourceRenameInput: any;
+    modalNewResourceInput: HTMLElement;
+    modalNewResourceLinkInput: HTMLElement;
+  };
+
   mapServiceTypeToIcon = mapServiceTypeToIcon;
 
   get page(): number {
@@ -458,15 +472,25 @@ export default class Resources extends Mixins(ResourceMixin) {
     }
   }
 
-  createFolderModal(): void {
-    this.newResource.type = "folder";
-    this.createResourceModal = true;
+  async createLinkModal(): Promise<void> {
+    this.createLinkResourceModal = true;
+    await this.$nextTick();
+    this.$refs.modalNewResourceLinkInput.focus();
   }
 
-  createResourceFromProvider(provider: IProvider): void {
+  async createFolderModal(): Promise<void> {
+    this.newResource.type = "folder";
+    this.createResourceModal = true;
+    await this.$nextTick();
+    this.$refs.modalNewResourceInput.focus();
+  }
+
+  async createResourceFromProvider(provider: IProvider): Promise<void> {
     this.newResource.resourceUrl = Resources.generateFullResourceUrl(provider);
     this.newResource.type = provider.software;
     this.createResourceModal = true;
+    await this.$nextTick();
+    this.$refs.modalNewResourceInput.focus();
   }
 
   static generateFullResourceUrl(provider: IProvider): string {
@@ -549,10 +573,12 @@ export default class Resources extends Mixins(ResourceMixin) {
     }
   }
 
-  handleRename(resource: IResource): void {
-    console.log("handleRename");
+  async handleRename(resource: IResource): Promise<void> {
     this.renameModal = true;
     this.updatedResource = { ...resource };
+    await this.$nextTick();
+    this.$refs.resourceRenameInput.focus();
+    this.$refs.resourceRenameInput.$el.querySelector("input").select();
   }
 
   handleMove(resource: IResource): void {
diff --git a/lib/graphql/resolvers/resource.ex b/lib/graphql/resolvers/resource.ex
index 386eb470e..5df019448 100644
--- a/lib/graphql/resolvers/resource.ex
+++ b/lib/graphql/resolvers/resource.ex
@@ -122,6 +122,9 @@ defmodule Mobilizon.GraphQL.Resolvers.Resource do
           {:ok, _, %Resource{} = resource} ->
             {:ok, resource}
 
+          {:error, %Ecto.Changeset{} = changeset} ->
+            {:error, changeset}
+
           {:error, _err} ->
             {:error, dgettext("errors", "Error while creating resource")}
         end
diff --git a/lib/mobilizon/resources/resource.ex b/lib/mobilizon/resources/resource.ex
index 6fdb13e73..e8f19caa2 100644
--- a/lib/mobilizon/resources/resource.ex
+++ b/lib/mobilizon/resources/resource.ex
@@ -63,6 +63,10 @@ defmodule Mobilizon.Resources.Resource do
     |> maybe_add_published_at()
     |> validate_resource_or_folder()
     |> validate_required(@required_attrs)
+    |> validate_length(:title, max: 200)
+    |> validate_length(:summary, max: 400)
+    |> validate_length(:resource_url, max: 400)
+    |> validate_length(:path, max: 500)
     |> unique_constraint(:url, name: :resource_url_index)
   end
 
diff --git a/lib/mobilizon/resources/resources.ex b/lib/mobilizon/resources/resources.ex
index 9ef6302fd..c83522d99 100644
--- a/lib/mobilizon/resources/resources.ex
+++ b/lib/mobilizon/resources/resources.ex
@@ -119,7 +119,11 @@ defmodule Mobilizon.Resources do
         {:ok, resource}
 
       {:error, operation, reason, _changes} ->
-        {:error, "Error while inserting resource when #{operation} because of #{inspect(reason)}"}
+        Logger.error(
+          "Error while inserting resource when #{operation} because of #{inspect(reason)}"
+        )
+
+        {:error, reason}
     end
   end