diff --git a/sources/bordertitleblock.h b/sources/bordertitleblock.h
index d9767d689..a56f2c9b6 100644
--- a/sources/bordertitleblock.h
+++ b/sources/bordertitleblock.h
@@ -95,6 +95,8 @@ class BorderTitleBlock : public QObject
 	QString title() const { return(btb_title_); }
 	/// @return the value of the title block "Folio" field
 	QString folio() const { return(btb_folio_); }
+	/// @return the value of the title block "Folio" field as displayed
+	QString finalfolio() const { return(btb_final_folio_); }
 	/// @return the value of the title block "Machine" field
 	QString machine() const { return(btb_machine_); }
 	/// @return the value of the title block "Locmach" field
diff --git a/sources/diagram.cpp b/sources/diagram.cpp
index 599416320..216f68e70 100644
--- a/sources/diagram.cpp
+++ b/sources/diagram.cpp
@@ -251,7 +251,7 @@ void Diagram::keyPressEvent(QKeyEvent *e)
 		if (!this->selectedContent().items(255).isEmpty()) {
 		switch(e -> key()) {
 			case Qt::Key_Left:
-				foreach (QGraphicsItem *item, selected_elmts) {
+				foreach (Element *item, selectedContent().elements) {
 					left_position = item->mapRectFromScene(item->boundingRect()).x();
 					if (left_position >= this->sceneRect().left() - item->boundingRect().width())
 					return;
@@ -260,7 +260,7 @@ void Diagram::keyPressEvent(QKeyEvent *e)
 				break;
 			case Qt::Key_Right: movement = QPointF(+xGrid, 0.0); break;
 			case Qt::Key_Up:
-				foreach (QGraphicsItem *item, selected_elmts) {
+				foreach (Element *item, selectedContent().elements) {
 					top_position = item->mapRectFromScene(item->boundingRect()).y();
 					if (top_position >= this->sceneRect().top() - item->boundingRect().height())
 						return;
diff --git a/sources/diagramfoliolist.cpp b/sources/diagramfoliolist.cpp
index 31bbfeed2..a5f7dc52e 100644
--- a/sources/diagramfoliolist.cpp
+++ b/sources/diagramfoliolist.cpp
@@ -92,7 +92,7 @@ void DiagramFolioList::drawBackground(QPainter *p, const QRectF &r)
 		if (settings.value("genericpanel/folio", true).toBool()){
 		fillRow(p, row_rect, diagram_list[i] -> border_and_titleblock.author(),
 				diagram_list[i] -> title(),
-				diagram_list[i] -> border_and_titleblock.folio(),
+				diagram_list[i] -> border_and_titleblock.finalfolio(),
 				diagram_list[i] -> border_and_titleblock.machine(),
 				diagram_list[i] -> border_and_titleblock.locmach(),
 				diagram_list[i] -> border_and_titleblock.indexrev(),
diff --git a/sources/diagramview.cpp b/sources/diagramview.cpp
index 4020c426b..94af0dc5d 100644
--- a/sources/diagramview.cpp
+++ b/sources/diagramview.cpp
@@ -44,6 +44,7 @@
 #include "dveventinterface.h"
 #include "diagrameventaddelement.h"
 #include "QPropertyUndoCommand/qpropertyundocommand.h"
+#include "qetshapeitem.h"
 
 /**
 	Constructeur
@@ -683,6 +684,8 @@ void DiagramView::scrollOnMovement(QKeyEvent *e){
 			QList<QGraphicsItem *> selected_elmts = scene->selectedContent().items(255);
 			QRectF viewed_scene = viewedSceneRect();
 			foreach (QGraphicsItem *qgi, selected_elmts){
+				if (qgraphicsitem_cast<Conductor *>(qgi)) continue;
+				if (qgraphicsitem_cast<QetShapeItem *>(qgi)) continue;
 				qreal x = qgi->pos().x();
 				qreal y = qgi->pos().y();
 				qreal bottom = viewed_scene.bottom();